Merge changes from topic "cherrypicker-L76600000960405157:N45800001364684986"...

Merge changes from topic "cherrypicker-L76600000960405157:N45800001364684986" into tm-mainline-prod am: abe848d3 am: c65515b1 am: a7997294

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



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