[automerger skipped] Merge changes I9ea7630d,Ia322147e into tm-qpr-dev am: c615c439 -s ours

am skip reason: Merged-In I9ea7630d09f0ec8ce8048a3d63b1c51b9aa9fdc7 with SHA-1 45487924 is already in history

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



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