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

Change-Id: I892e60164aa41a8fcc7044ac571d45b9efc70730