Merge "Fix false positive of activity leak in NexusLauncherTests" into rvc-dev am: b04ab6ce am: 6ba00520 am: 8d5a34bc Change-Id: I141e95f2a4486ffdf51227302f06f747803acfe5