[automerger skipped] Merge "Add CarrierId column in TelephonyProvider" am: 1df5ca6a71 am: dfed97ba6d
am: 41ad850c96  -s ours

Change-Id: I10808910c9bd91367cb73b43f765ead7c4310e0a