Merge "Avoid NPE around mReusedTask of ActivityStarter"
am: f741f88284

Change-Id: I64701d06c2e15b0ad11018c233fce32dce1caa52