Merge "uce: Updating UCE API to accept ICC-ID." am: d20bdb915a
am: f0b1c48141

Change-Id: Iebacfbd592a36da5736b4979c6a6c0e47fa0effc