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

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

Change-Id: I223d2b18b175e8ceb8f76dd8c190bb330295e812