[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L26800000956936244:N17300001304403061" into tm-qpr-dev am: aaab18d5 -s ours

am skip reason: Merged-In I22486c225aa219f61b292d6729fa4f8f4c8b52a8 with SHA-1 8ee2969e is already in history

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



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