Merge changes from topics...

Merge changes from topics "cherrypicker-L60000000957790553:N63900001320988662", "cherrypicker-L78900000957813236:N55000001321779106" into tm-qpr-dev am: d5466138

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



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