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

* commit '8f08db9def9b40075534facd20add5835cd3b5be':
  Frameworks/base: Propagate boot status to installd