Merge "Using Context#getSystemService instead of ServiceManager#checkService" am: d769b3863e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1463902

Change-Id: I8097dd8136424af6437914631592999d0f839758