Merge changes from topic "wait-for-aidl" into stage-aosp-master

* changes:
  PowerManagerService: use waitForService.
  ServiceManagerProxy: add APIs.