Merge "Modify the deprecation of PhoneNumberUtil isEmergencyNumber"