Merge "Reset killedByAm flag at attachApplicationLocked" into lmp-mr1-dev