[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: bf133779 -s ours am: 0417abcd -s ours am: ab56c0a7 -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: I465f5540fed86579e85fae5f51adcae212b31518
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>