Merge "[1.5/N] side fps bouncer - update UdfpsKeyguardViewControllerBaseTest"