[automerger skipped] Merge changes...

[automerger skipped] Merge changes Ifa570dd8,Id7367461,Id5f60e7a,I0244c598,I317db266 into tm-qpr-dev am: 1be97a1f -s ours

am skip reason: Merged-In Ifa570dd84bb5fad8b82e2d30e3444d76bb007905 with SHA-1 1ac7a676 is already in history

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



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