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

Change-Id: I89d20cb9ca28ad4fb26fbbf5cf2ba81985fa71ba