Merge "Add CarrierId column in TelephonyProvider" am: c0e0ea3de4
am: f109c82ec6

Change-Id: I1c850a71e64a08ccfff42b1915905861f92c3b30