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

Change-Id: I024d88a834f3075973c71412b248557ac8516aac