am b4bbf887: resolved conflicts for merge of 708aa238 to klp-modular-dev-plus-aosp

* commit 'b4bbf8878c3a6b2a17a3a96f1a23300748dbd81a':
  add --shutdown_after option to recovery