[automerger skipped] Merge Android 14 am: ee5fd8a652 -s ours am: bc30318c38 -s ours am: b87cf9eaf0 -s ours am: 1cb8a4b367 -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: I60f71effb54240c2153ad749ad82d8921a955e90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>