Merge "[MS30] Remove ServiceManager#getService dependency" am: 703b9219a6 am: e17b853055

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

Change-Id: I223d2b18b175e8ceb8f76dd8c190bb330295e812
tree: fbc2c768fbc20fcb1483f7b2bbbc6ff09540a5f8
  1. core/
  2. framework/
  3. framework-t/
  4. service-t/
  5. services/
  6. tests/