am 90c6fcb0: Reconcile with ics-factoryrom-2-release

* commit '90c6fcb06effa856c3e206f190bb5edec61efe02':
  Revert "Enable the app to hide SIM import"
  Revert "Enable the app to hide SIM import"