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

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

Change-Id: Ib9caca1691a86b2dd1823a4d1a07988f49896c8d