Merge changes Ia8496a8d,Ic011551f,I13ff9bb0

* changes:
  In PhoneFactory, dynamically allocate 2nd phone when switching to dsds
  Have UiccController compitible with dynamicy ss <-> ds switch
  Update ProxyController to be compatible with dynamic ss <-> ds switch