Merge "[MS30] Remove ServiceManager#getService dependency" am: eb03a3b8ea

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

Change-Id: Ia597423bbba03d65755bf4c8f295c008b3536329