[automerger skipped] Merge changes I70820082,I15691674,Ie018fe09 into tm-qpr-dev am: ff14131c -s ours am: ccd4d0fa -s ours

am skip reason: Merged-In I70820082081a18d2e5ccbc7779c305c0c8523f66 with SHA-1 82422dcb is already in history

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



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