[automerger skipped] Merge "Merge UP1A.231005.007" into aosp-main-future am:...

[automerger skipped] Merge "Merge UP1A.231005.007" into aosp-main-future am: 37051897 -s ours am: af2828c4 -s ours

am skip reason: Merged-In Ibce32cc09ad2991789569f35ef2f71f90537fdce with SHA-1 7a62a311 is already in history

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



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