[automerger skipped] Merge "Broadcaster: Fix atest running wrong unit tests"...

[automerger skipped] Merge "Broadcaster: Fix atest running wrong unit tests" into tm-qpr-dev am: 7be21c84 -s ours am: 0bb3606a -s ours

am skip reason: Merged-In I0bcfcc83f0bdac1ce7803455abe427e89c34fa4f with SHA-1 1397a8eb is already in history

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



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