[automerger skipped] Merge "Move TelephonyUtils to base/telephony" am:...
[automerger skipped] Merge "Move TelephonyUtils to base/telephony" am: 2023b24d am: cdd69c88 am: 7b1b25b2 -s ours
am skip reason: Change-Id I5b0da08d1df64e4a92e05b33bc729f0331262ef0 with SHA-1 70e36528 is in history
Change-Id: I8c655addf45ae416d7f75a9d14b1588438da26d8