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: I7423a86f82e32c00549cb5894e14123065dc0f3e
This commit is contained in: