Merge "Revert "Use DeviceConfig in MediaMetricsManagerService"" into sc-dev