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

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



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