[automerger skipped] Merge changes I682f1e43,Ib5435169,Ie738e73d into tm-dev...

[automerger skipped] Merge changes I682f1e43,Ib5435169,Ie738e73d into tm-dev am: c2a8db26 am: a732288f -s ours

am skip reason: Merged-In I682f1e4333a4bd271b02a432d376eaa4bfaec5a7 with SHA-1 4f184f24 is already in history

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



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