[automerger skipped] Merge "Modify the deprecation of PhoneNumberUtil...
[automerger skipped] Merge "Modify the deprecation of PhoneNumberUtil isEmergencyNumber" am: b8c7afac am: 4362b01d
am: 47fdabe9 -s ours
am skip reason: change_id If82bfc5102a9ac1d7e07ff744c0775a1dc95ba2c with SHA1 c6d55453 is in history
Change-Id: I1f15c088f35ec60918c7296317969907c2699297