[automerger skipped] Merge "[Settings] Convert to getSystemService(Class<T>)" am: 13fb77c6 am: 70f887af am: f9f2fe3f -s ours

am skip reason: skipped by user bonianchen

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

Change-Id: Ib85316b2193f4056f8818d98ae9899fd5c5c783a