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

* commit '4d9ee897d92393cc9e8f973fab7b4bfa200920b2':
  Use the full SIM UICC to prevent possible collisions

Change-Id: I71a6f8373e2bb74f4e5f72cd70e045b98b8d5009