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

Change-Id: Id51a6dabbf1fec793ca0a905454a412359e0cd57