[automerger skipped] Add strict_mode: false am: 47e9c1cbf8 am: d49b31e9ee -s ours

am skip reason: Merged-In I28882c4b9165165988d6ddab36af328ccb43161f with SHA-1 aca1b9e0dd is already in history

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

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