Add CarrierId column in TelephonyProvider

Add a column in provider to migrate mno and mvno to carrierid.

Bug: 115709816
Test: runtest --path tests/src/com/android/providers/telephony/TelephonyProviderTest.java
Change-Id: I9c0c0fd069acc7f182d94f422ff15f45ebf187a9
Merged-In: I9c0c0fd069acc7f182d94f422ff15f45ebf187a9
2 files changed