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

[automerger skipped] Merge changes I3f999d40,Ic807df3b into tm-dev am: 96c76a94 am: d0d00a46 am: 7f284eac am: 875b0bcc -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: I3e785d356c7b54d19aa879650b1f8dfb55847369
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>