[automerger skipped] Merge Android 14 am: ee5fd8a652 -s ours am: bc30318c38 -s ours

am skip reason: Merged-In I84e5b1b94305193449709e667b45c267a44bc453 with SHA-1 ba5376b438 is already in history

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

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