Merge "Update PhoneStateListener#onOutgoingEmergencySms" am: c5d02da0f6

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

Change-Id: I5edcfe057174d1b6e9d4c0c55540031653c7e14f