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

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

Change-Id: Id2974f5339afa48f40d9847cede33f184d12c612