Merge changes from topic "am-48687fdbae704c9ab0e449cd37acfcdb" into...

Merge changes from topic "am-48687fdbae704c9ab0e449cd37acfcdb" into udc-qpr-dev am: eb238e84 -s ours

am skip reason: Merged-In I03522897e93af59508efa2f536dd217d48f78110 with SHA-1 8ecede4b is already in history

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



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