Merge "Avoid NPE around mReusedTask of ActivityStarter" am: f741f88284 am: e79cb5c81d
am: 77fc19fa8e

Change-Id: I477db42ff85d52c07f29b844d7d251ce631251cd