[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L50100000956399295:N18700001295161799" into tm-qpr-dev am: 69c1f9f9 -s ours

am skip reason: Merged-In I681071476a5b30abbb1c1147d09255d2aae379c4 with SHA-1 43feb2ec is already in history

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



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