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

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

Change-Id: I39c189e576ac4fb42d722936f65ea03580793f6b