Merge "Use the full SIM UICC to prevent possible collisions" into nyc-dev am: 629864c882
am: abae8206d3

* commit 'abae8206d333e2c03e9b7092ec6884b5b8866b67':

Change-Id: Idc7a805a9568da4909fd786dda273107f3bdbabb