Merge "Convert gUnifiedServiceManager to IBinder and use in ServiceManagerProxy" into main am: 7cafeb8b4a

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

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