tree e3575011b46eb0b32852aeab9c211db3cfb12e5d
parent 153a500a793b67ec6c054703c632bf8705f45bd0
parent 355ef2c7a6eab1cd3c907ff7cdbab9d80cdc402f
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1692988185 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1692988185 +0000

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>