[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L74800000956527893:N41000001298079811" into tm-qpr-dev am: cc1b6dbd am: 2930e1c6 -s ours

am skip reason: Merged-In I80b742bb221fbc0aced1064a8ad6c4b0b74664d4 with SHA-1 1c19f807 is already in history

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



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