Merge "Avoid NPE around mReusedTask of ActivityStarter" into nyc-mr2-dev
am: 53db761efb

Change-Id: I33a8ef76a1a9c192889f7f66b32b383986789e04