[automerger skipped] Merge changes I28a4d60a,I6dc8713f,I8d85fb54 into...

[automerger skipped] Merge changes I28a4d60a,I6dc8713f,I8d85fb54 into tm-qpr-dev am: 05334db8 -s ours

am skip reason: Merged-In I85b60f4bece97e1526b1234c71357a57d47d279e with SHA-1 1093aee1 is already in history

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



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