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

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

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