Merge "Merge "Reland ag/24529645" into tm-dev am: ee7aff61" into...

Merge "Merge "Reland ag/24529645" into tm-dev am: ee7aff61" into tm-mainline-prod am: 2c86eff4 am: 79a3f596 am: 0810aa60

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



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