Merge "Use TelephonyManager#isEmergencyNumber() instead" am: 1963c4b1c6 am: e931ca461e

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

Change-Id: I1e36efb6b69535e2d3afc0e5b5650b372d9bd1a1