Merge "[Settings] Rollback design for getSystemService(String)" am: 7a8463dbf8
am: de520dd11a
am: 1f5c043b0c
am: 49da45d973
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1648047 Change-Id: Id673f1877af07846afe092afd6233eceb589d6c8
This commit is contained in: