[automerger skipped] Merge changes from topic "revert-1645152-getSystemService(Class<T>)-KMFSZZGDPU" am: 194af56330
am: a472f53325
am: 5735be835c
-s ours
am skip reason: skipped by user bonianchen Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1659980 Change-Id: I2204d4f9d87decdb34160a75b895f143fffc3882
This commit is contained in: