[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L13700000958927953:N69400001343558341" into tm-qpr-dev am: b9d0c19d -s ours am: f73e56a1 -s ours

am skip reason: Merged-In I39e474b2a0d167c1098ba9df15d5518644786e9e with SHA-1 1a477a04 is already in history

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



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