Merge changes from topic "cherrypicker-L56200000957314479:N16200001311084956"...

Merge changes from topic "cherrypicker-L56200000957314479:N16200001311084956" into tm-qpr-dev am: 163adecf

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



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