Merge "[Settings] Support getSystemService(Class<T>)" am: 513da92357 am: 5734490d23 am: 8cd695efea

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1639943

Change-Id: I905f9d1646a9d9ea70e42c4b5368ff983611bee3