Merge "Remove old unused code from TelephonyProvider."
am: 6986eca59c

Change-Id: If1d815a80b7e1e51bc9770a1bd1c8d8f8c9c61a3