Merge "Migrate to use instrumentation classes from settingslib."