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