am 46b42ef3: am 05f9e8d0: Merge "Minimize the number of calls to PhoneNumberUtils.isLocalEmergencyNumber." into mnc-dr-dev

* commit '46b42ef307e1b334db7a6ff42e1a69349331851b':
  Minimize the number of calls to PhoneNumberUtils.isLocalEmergencyNumber.