[automerger skipped] Merge 24Q3 to AOSP main am: f7d3ae02b9 -s ours

am skip reason: Merged-In If3cbdd28acb0b8ca41a6a81d67f43f7ca8387e8f with SHA-1 e07ed24fe1 is already in history

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

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