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

Merge changes from topic "move-emergency-phone-update" am: 77b5c5a3 am: 4c805f8e am: 6ae0e0d4 am: edcb8336

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

Change-Id: Ibdd11bd94cbe984a35da30f0a96020486576083a