Merge changes from topic "am-bffb9ddeb0de4c15a168076e3071b9c6" into udc-d1-dev-plus-aosp am: 364ea3f4fd am: 355ef2c7a6

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

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