Merge changes from topic "am-c8f7be5db5254518baade20eb38b8ba8" into...

Merge changes from topic "am-c8f7be5db5254518baade20eb38b8ba8" into tm-d1-dev-plus-aosp am: 4601de90 -s ours

am skip reason: Merged-In I5285f0754775c56a73ad1b6eef4bdb7ec3d59757 with SHA-1 040c9baf is already in history

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



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