am 85a61c4d: Merge "Only run "core" apps when encrypting device." into ics-factoryrom

* commit '85a61c4d6fedff2f1539e4cfff4b173ce0a28a3f':
  Only run "core" apps when encrypting device.