[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L08600000958316053:N45700001331223238" into tm-qpr-dev am: 04ca17d1 am: d063a975 -s ours

am skip reason: Merged-In I9821ba7137c7e69927022db2438767319eedbd93 with SHA-1 7b7aa162 is already in history

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



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