[automerger skipped] Merge changes I4a75924b,I62ad7797 into tm-qpr-dev am:...

[automerger skipped] Merge changes I4a75924b,I62ad7797 into tm-qpr-dev am: 386f22eb -s ours am: 7971611e -s ours

am skip reason: Merged-In I4a75924b743760f81f23556de00793d55f32f55f with SHA-1 024e5c23 is already in history

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



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