[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: f5b613ab1b -s ours

am skip reason: Merged-In I379a5080ddf06cc4fa5a3b782ec6ef10a8dd92f0 with SHA-1 d94fa458fe is already in history

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

Change-Id: I146936b3623afc21210d30f8a22efa7cfcd4feac
Signed-off-by: Automerger Merge Worker <[email protected]>