[automerger skipped] Merge changes I08a0c3ed,If0afe59d into tm-qpr-dev am: e58f37d0 am: 190c3051 -s ours

am skip reason: Merged-In I08a0c3edadceaa4dc2ed058c2de66b528fa82f67 with SHA-1 2595fb54 is already in history

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



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