Merge "Fix false positive of activity leak in NexusLauncherTests" into rvc-dev am: b04ab6ceb1 am: 6ba005205d

Change-Id: I04c6fe345269fed06a6ea4574a22819ae4c8e25a