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

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

Change-Id: Ib73d9922fcca7b42a9c87c345dc29e4c54c33492