[automerger skipped] Merge "Merge Android U (ab/10368041)" into aosp-main-future am: ec292cc7 -s ours

am skip reason: Merged-In I50c58626cdc44c29ea1d4f95e77a61ecd0e44bf2 with SHA-1 4bed73ff is already in history

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



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