Merge "Add CarrierId column in TelephonyProvider"
am: c0e0ea3de4

Change-Id: Ia0e49d5f82666dd2e1cfe1413ade6840075833f9