tree 7f0aae19cac2c3c4728a7f5d9a1eeb44dda267ec
parent a39a07cf874015a11cf192a327ea89fd05003dd0
parent 47fdabe9fa3e3ab8dfbd4c1f437e124f91288898
author Shuo Qian <shuoq@google.com> 1554334125 -0700
committer android-build-merger <android-build-merger@google.com> 1554334125 -0700

[automerger skipped] Merge "Modify the deprecation of PhoneNumberUtil isEmergencyNumber" am: b8c7afacec am: 4362b01d2c
am: 47fdabe9fa -s ours
am skip reason: change_id If82bfc5102a9ac1d7e07ff744c0775a1dc95ba2c with SHA1 c6d55453ee is in history

Change-Id: I1f15c088f35ec60918c7296317969907c2699297