Merge "[Settings] Rollback design for getSystemService(String)" am: 7a8463dbf8 am: de520dd11a

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

Change-Id: I88dff2ed3675305469015351c54272ea6a0d1854