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

am skip reason: Merged-In I005b8d16c5bab23f7e456ec71a2e062bfd5199c7 with SHA-1 9548337463 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/common/+/25969054

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