Merge "Convert gUnifiedServiceManager to IBinder and use in ServiceManagerProxy" into main