Merge changes from topic "presubmit-am-4001ff262c92499fa4151899059d1177" into sc-qpr1-dev am: 63d98fb0f5

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

Change-Id: I7e23008a8e882c14cb4ae48bbfe73dc7f7ada7c4