Merge "[native] Restore ServiceManager#getService() to return IBinder" into main am: 91cb820c1d

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

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