Merge "Unrevert "Move instrumentation classes to SettingsLib to share between mobile/TV."""