Merge "Merge changes I0105085c,I8ae8bc0f,If74b1556 am: 228d64bf am:...

Merge "Merge changes I0105085c,I8ae8bc0f,If74b1556 am: 228d64bf am: 48e920df" into tm-qpr-dev-plus-aosp am: faa42999

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



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