[automerger skipped] Merge changes from topic "cherrypicker-L60500000959991937:N24900001358805381" into main am: bb6c315e -s ours

am skip reason: Merged-In I34b1a3121334fb14b0292c48d6a589a1bb73e629 with SHA-1 9247108c is already in history

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



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