Merge changes from topic "move-emergency-phone-update" am: 77b5c5a31b am: 4c805f8ed6

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470383

Change-Id: I993099a22efc5f2fefbf724a59f8b482abad91c7