Merge "Fixed SessionLifecycleTest so it always finishes OutOfProcessLoginActivity." into pie-cts-dev