Merge "Remove old unused code from TelephonyProvider." am: 6986eca59c am: 552667d265
am: 00d64b1093

Change-Id: I80fa2cef06378024d83ea7536b854a890d1e45ba