Merge "Add ICCID_PREFIX column in CarridId DB"
am: 73200d9ac9

Change-Id: I142e4f3c760e3b0216d89c197d760e9acc0255fd