[automerger skipped] Merge "[Settings] Convert to getSystemService(Class<T>)" am: 13fb77c652 am: 70f887af52 am: f9f2fe3f84 -s ours am: 836b5bb4d1
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1645152 Change-Id: I160e2ddc47113c1229b8aa7a3838488cda3a463e
This commit is contained in: