Merge "Modify the deprecation of PhoneNumberUtil isEmergencyNumber"
am: b8c7afacec

Change-Id: I5a41e63ee113447f75178bf3bfd996431046799a