[automerger skipped] Merge "Add CarrierId column in TelephonyProvider" am: c0e0ea3de4 am: f109c82ec6
am: e428260b85  -s ours

Change-Id: Id712aa1bfa141f6d185e1f62650fe19289832547