Merge "Add ICCID_PREFIX column in CarridId DB" am: 73200d9ac9 am: 33395ea925
am: 448c1fd15a  -s ours

Change-Id: Iab6bb2713567efd65e6865c08399edaf3e741cc2