Merge "Fix false positive of activity leak in NexusLauncherTests" into rvc-dev am: b04ab6ceb1 am: 629a579f79 am: b025d550ad am: 131c1f5af4

Change-Id: I430fb621a337c6ee42e5d59362e42e6657e55336