[automerger skipped] Merge "Set up unit test environment for...

[automerger skipped] Merge "Set up unit test environment for BassClientService" into tm-dev am: 89f4da04 am: 785630cc -s ours am: 66587ff5 -s ours am: c4626771 -s ours

am skip reason: Merged-In I88dd81d02b44036c1bfae044b16e303b1c3a3c9d with SHA-1 118fa289 is already in history

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



Change-Id: I2fff0f08a858d6bbd393d7887fd7a5c13d73aeae
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>