Merge "Added carrier_id support to the carrier_key table in CarrierInformation DB Also Updated the related test cases" am: c4d25e9890

Original change: https://android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/2033186

Change-Id: I0e9101afff74e048b580267258e4186500166e90