[automerger skipped] Merge changes I3f999d40,Ic807df3b into tm-dev am:...

[automerger skipped] Merge changes I3f999d40,Ic807df3b into tm-dev am: 96c76a94 am: 8762c79e am: 770219ed -s ours am: 6a43362d -s ours

am skip reason: Merged-In I3f999d405fb3a0be2df32b05f54b9cef98d10f19 with SHA-1 08cb26e2 is already in history

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



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