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

Change-Id: I2842a05e0cb9c867e8a1eb726fe8204e567a4d2f