Merge "Remove old migration from subId to ICCID" am: a3587af6bf am: 4e1f155a2a am: 094ecd8ba1

Change-Id: I5333846e2e00bec826d5c8345f32ca3c9dc184a1