Merge mainline-release 6664920 to master - DO NOT MERGE am: 50a06620fd

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

Change-Id: I3888230dc7d60376c855274712a68c55be294ca9