Added carrier_id support to the carrier_key table in CarrierInformation DB am: 6179d11af8 am: 1d88a85783

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telecomm/+/2033663

Change-Id: Iff3db24bc78a916f078165e6270d3bcaaf28b464