Merge "[ActivityManager] Reset killed flag at attachApplicationLocked" am: 1d5447d70b
am: 5820f7fff5

Change-Id: I6062fdf8a686fcb64340b26f8aa200d5506fb91c