am 69a6d537: Merge "Enter minimal boot mode when booting encrypted" into ics-factoryrom

* commit '69a6d537e6f29683f685ecb688f0b06b1c0b2b15':
  Enter minimal boot mode when booting encrypted