am 2070ded8: Reconcile with ics-factoryrom-2-release

* commit '2070ded8d8456f66bfbee620b4b597eccda20c54':
  Revert "Enable the app to hide SIM import"