[automerger skipped] Merge Android 24Q1 Release (ab/11220357) am: 49127d863c -s ours

am skip reason: Merged-In Ie1a75f44606c4cd7a0971a09322169c01bdca325 with SHA-1 28392b5323 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/extras/+/25973945

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