[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L45200000958350315:N48800001332110545" into tm-qpr-dev am: f1b2021f am: 1ff6591a -s ours

am skip reason: Merged-In I70b94fdd9418607e08a4dc08e7a9d6ea48c1eb74 with SHA-1 2567030c is already in history

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



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