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

am skip reason: Merged-In I7f7bdc40d27e43c4c3876a50a66d66a5dedcfe86 with SHA-1 56aa4d3772 is already in history

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

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