Merge "Add CarrierId column in TelephonyProvider"
am: 1df5ca6a71

Change-Id: I35fc941a9e7b1dace0b1572976dd854227e434a5