[automerger skipped] Merge changes from topic...

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

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

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



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