[automerger skipped] Merge changes If2ab94f8,Id3dd6add,Icc142685,Icac3c80b into tm-qpr-dev am: 7ccd6571 -s ours am: 8bdb6778 -s ours

am skip reason: Merged-In If2ab94f8033035ddf7b40a1a5acdc58b8f272acc with SHA-1 e921040a is already in history

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



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