[automerger skipped] Merge changes Ie7aff67c,Iebaee7ec,I51123727 into...

[automerger skipped] Merge changes Ie7aff67c,Iebaee7ec,I51123727 into tm-d1-dev am: ce6403b5 am: 0a9b3e43 -s ours

am skip reason: Merged-In Ie7aff67cdca7f25008237f5f50e89502ab81ab77 with SHA-1 5508eee1 is already in history

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



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