[automerger skipped] DO NOT MERGE -  Mark RQ2A.210105.001 as merged. am: 400c3df20e -s ours am: 796e061b84 -s ours am: 955aa3267f -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ic8b4b2992af962fce559e4f690bc4636a4706943