Merge changes from topic "cherrypicker-L12400000957513984:N30500001315227278"...

Merge changes from topic "cherrypicker-L12400000957513984:N30500001315227278" into tm-qpr-dev am: 818a3830

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



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