Merge "Revert "Fix false positive of activity leak in NexusLauncherTests"" into rvc-dev am: 56dfd7c643 am: b921ded2cd am: 10693e8297 am: 6720df892e

Change-Id: Ib09899b4a94e7e0e51fe216da90838d3998d61cb