[automerger skipped] Merge changes I7fcb7c46,Ia39886c4 into tm-dev am:...

[automerger skipped] Merge changes I7fcb7c46,Ia39886c4 into tm-dev am: 70614401 am: 8f63d02a am: 937c7aa8 -s ours

am skip reason: Merged-In I7fcb7c46f668f48560a72399a3c5087c6da3827f with SHA-1 428cb27b is already in history

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



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