Merge change 6092

* changes:
  Remove duplicate code in Sim/Ruim card, handle IccCardStatus.