Merge changes I4c85ef17,I0a5df382 into tm-qpr-dev am: 30966414

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



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