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

Change-Id: I4a61db858021c621f699ed124191add34ee1bc25