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

This reverts commit 2e9781034f796826727a55ad36f8213a8d7452fb.

Reason for revert: NPE now fixed, test added, see b/72267201.

Change-Id: I63cf296675e526776e0bef334d30141ea98904c3
9 files changed