Added carrier_id support to the carrier_key table in CarrierInformation DB

Bug: b/191919168
Test: Buid, aTest verification Passed
Change-Id: Ib51d6eb5231ceb65fffa8e83706c47ce17afd640
Merged-In: Ib51d6eb5231ceb65fffa8e83706c47ce17afd640
2 files changed