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

* commit '7db48ed03623834f7b8b420c83ab7916f6b39a8a':
  Reset killedByAm flag at attachApplicationLocked