[automerger skipped] Merge 10952656 am: d09def04dc -s ours am: cddde9ec3d -s ours

am skip reason: Merged-In Ia25e496f6fff34c9e991cfea7c1a4f6a4b204876 with SHA-1 cab0eeee32 is already in history

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

Change-Id: Ia468c5ab0887700e462b1273570c3b70ee745011
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>