Merge changes from topic "cherrypicker-L78100000957439934:N08000001313698819"...

Merge changes from topic "cherrypicker-L78100000957439934:N08000001313698819" into tm-qpr-dev am: 252e65ed

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



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