[automerger skipped] Merge "Added carrier_id support to the carrier_key table...

[automerger skipped] Merge "Added carrier_id support to the carrier_key table in CarrierInformation DB Also Updated the related test cases" am: 462d62a8 am: abc15c9f am: 4278b509 -s ours am: 09d8f3de -s ours am: 2efda0db -s ours

am skip reason: Merged-In Iec4f3394f3c671af2bf6d679cb57eeae35107961 with SHA-1 8ae340d1 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2033643

Change-Id: I920509ed2ce8e929e6f179f08f30d2a52f7d1ff5