am 4e321745: resolved conflicts for cafacef6 to stage-aosp-master

* commit '4e321745173de1eb89343238fadfbcc7ba1a88f9':
  Frameworks/base: Propagate boot status to installd