Merge "wakelock test: Use AServiceManager_waitForService" am: 27335707 am:...

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

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



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