Merge "Telephony can access TelephonyProvider SIMINFO table"