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

* changes:
  Add waitForService to AIDL.
  servicemanager: notifications