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

Change-Id: I74e90fc150b6928e244a35aabeb865b6ad521810