[automerger skipped] Merge "Added carrier_id support to the carrier_key table in CarrierInformation DB Also Updated the related test cases" am: c4d25e9890 am: c8f9e8ad99 am: 058aa9887f -s ours

am skip reason: Merged-In I8ad388bbb120c32ba874312bcc5c63cc1371348a with SHA-1 ad476e6061 is already in history

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

Change-Id: Ib1bb3aea973cbf4be106d6629471ade1407c42a9