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

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

Change-Id: I5c37ff8092125e979b83cfb8207f45507ed6c604