Merge "Add test coverage for CarKeyguardViewController" into rvc-dev