[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L09000000956548908:N73400001298271020" into tm-qpr-dev am: 9fe430d0 -s ours am: 3e1dceef -s ours

am skip reason: Merged-In I762978c5db35b4c182a60693df9777c24cf84e3a with SHA-1 7fc2c9df is already in history

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



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