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

Change-Id: I38d27b7d10af2a677c454b080984ad6cd72014f3