Merge changes from topics "141018421_set3", "remove_getPhoneId"

* changes:
  If uicc apps are disabled, mark its NOT_READY state final.
  Update TelephonyRegistryTest to not use getPhoneId.