[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L20900000958303793:N37600001331385366" into tm-qpr-dev am: 474f1049 -s ours am: 5beab05e -s ours

am skip reason: Merged-In I73eeb473de94ae830cb38ea57edc4b23ab5f99c3 with SHA-1 5bc7f1a3 is already in history

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



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