[automerger skipped] btm: Enhance with targeted announcements am: 12cd88cd -s ours am: 96020262 -s ours

am skip reason: Merged-In Ic33306aa81d0c35332be9c73741fc2e7eaea0f51 with SHA-1 d78b174a is already in history

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



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