[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" am: c2e89bd3 am: d79eecc8 am: 8585f211 -s ours am: 605e24d7 -s ours am: 681fa1dd -s ours

am skip reason: Merged-In Ib51d6eb5231ceb65fffa8e83706c47ce17afd640 with SHA-1 7792574a is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2033051

Change-Id: If252a8a8658179a43e467fde1fd89a9ed901bd08