Merge "activity_attribution: Use AServiceManager_waitForService" am:...

Merge "activity_attribution: Use AServiceManager_waitForService" am: cd4a93df am: 794342a5 am: 5d73c49d

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



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