Merge "Update PhoneStateListener#onOutgoingEmergencySms" am: c5d02da0f6 am: b37753c29a am: 75c5434ddd

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

Change-Id: I830b4bc2db3c53c5c2f21ba1f099af8eaccbfe70