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

Change-Id: I54afd53f6fe0219f33521295a2dde90e911a55f7