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

am skip reason: Merged-In Ief76d4968c3827758fc7e094cefcb80a44aa872d with SHA-1 44e5e00b41 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/25972546

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