Merge "AServiceManager_getService deprecated" am: 46175419

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2288495



Change-Id: Ic7e0121b2726041025e2e48fc0306071454750f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>