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