Merge "Fix false positive of activity leak in NexusLauncherTests" into rvc-dev am: b04ab6ce am: 629a579f am: b025d550 Change-Id: I3b0c116bade0543daa8a8e9852768091c9392a26