[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L95100000958232375:N14700001329291186" into tm-qpr-dev am: ee690a73 -s ours am: d1c4d3c6 -s ours

am skip reason: Merged-In Ib0065cc4d85bbd914b07f17080227ada969cbb44 with SHA-1 c068aafa is already in history

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



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