Merge "wakelock test: Use AServiceManager_waitForService" am: 27335707 am: 9a63f155

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



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