Merge "Fix false positive of activity leak in NexusLauncherTests" into rvc-dev am: b04ab6ceb1 am: 629a579f79 am: 2412980dfd

Change-Id: I00d5a2803f583adeae1457dd120b8fc3761dd685