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

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

Change-Id: Ibaf70662b40b2a658752c946acd07a8f8d9205b8