Merge "Reset killedByAm flag at attachApplicationLocked"