Merge "AServiceManager_getService deprecated" am: 46175419 am: 11c9dd9b am: 7b4465c0

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



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