[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L94700000958095889:N77900001327069473" into tm-qpr-dev am: 156c1792 am: 18a6a599 -s ours

am skip reason: Merged-In I71b4b320962108e665fb0f0f2b52b75aad5c5230 with SHA-1 80c7dad1 is already in history

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



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