[automerger skipped] Merge changes If7ed622d,Id31e13a4,I2d384d53 into...

[automerger skipped] Merge changes If7ed622d,Id31e13a4,I2d384d53 into tm-qpr-dev am: 892858da -s ours am: e9775d6c -s ours

am skip reason: Merged-In If7ed622d0c1109ccdd866c5627651114390eba61 with SHA-1 9d2076fe is already in history

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



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