am 11c67c92: am 7db48ed0: Merge "Reset killedByAm flag at attachApplicationLocked"

* commit '11c67c92de3522a50b9994eb83e34c152902ad18':
  Reset killedByAm flag at attachApplicationLocked