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