Merge "Revert "Log the apk optimization state in the MetricsLogger""