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

Merge changes from topic "am-cbd64a1e1d36468691ede3692d8459b9" into tm-qpr-dev-plus-aosp am: 39e4794a -s ours

am skip reason: Merged-In I10c1fc206b7bdf7bf97e80bf1bc579e936021f37 with SHA-1 6a4e7f28 is already in history

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



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