Merge changes from topics...

Merge changes from topics "cherrypicker-L21400000958659782:N41900001338162750", "cherrypicker-L68700000958657190:N53400001338192534" into tm-qpr-dev am: b7e7be21

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



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