Merge "Add CarrierId column in TelephonyProvider"