[automerger skipped] Merge changes Ia4f40a6b,Icf835d91,I27b462f7 into...

[automerger skipped] Merge changes Ia4f40a6b,Icf835d91,I27b462f7 into tm-qpr-dev am: 37bd31d6 am: b6cc9e04 -s ours

am skip reason: Merged-In Ia4f40a6bead331883a381205cc150e009ec18070 with SHA-1 9650c45c is already in history

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



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