[automerger skipped] Merge "Reland ag/24529645" into tm-dev am: ee7aff61 am: 14ac3560 am: 2d36000b -s ours am: 89b40beb -s ours am: ebc00def -s ours am: eb6fd7e9 -s ours am: a92ac6f7 -s ours

am skip reason: Merged-In Ie7210673d65656ef9dbb2a4759a3636025b67b44 with SHA-1 31323451 is already in history

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



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