Merge "Migrate clients from Binder.waitForService to ServiceManager.waitForService" into rvc-dev