[automerger skipped] Merge "Merge Android 24Q1 Release (ab/11220357)" into aosp-main-future am: 6387b7e6b2 -s ours

am skip reason: Merged-In If21ca5e914a5ee5aff3fbeeee9595bb77a8fc3d0 with SHA-1 40d9abb773 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25973942

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