Merge "AServiceManager_getService deprecated" am: 46175419f6 am: 11c9dd9baa

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

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