Merge "Remove old migration from subId to ICCID"
am: a3587af6bf

Change-Id: I22d04f9c809fb8f1199f51e159f4a1673cfdb849