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

Change-Id: I5b11e708511cea2b8ac77a96effd0c41e231c7df