[automerger skipped] Merge "audio client: Use AServiceManager_waitForService"...

[automerger skipped] Merge "audio client: Use AServiceManager_waitForService" into tm-qpr-dev am: 51bc048e -s ours am: 8f534f20 -s ours

am skip reason: Merged-In If7022e9726b91990723922408284f2a885abbf3a with SHA-1 84b8cf7e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/21342415



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