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

* commit '629864c882436075eb3404f9e62897ed6676c912':
  Use the full SIM UICC to prevent possible collisions

Change-Id: I036d1856bdf0eef84f906def6d66fed2e0ebee8a