Merge "[Settings] Convert to getSystemService(Class<T>)" am: 13fb77c652 am: 70f887af52

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

Change-Id: I89fa2de521bb07911f0c7ee0122ba3b2cb062fab