Merge "Revert "Re-enable test that was causing TimeoutExceptions on ARM64.""