Merge "Fixed AAAPlusPlusVerifySysuiRequiredTestPropertiesTest broken by missing annotation in CarKeyguardViewControllerTest." into rvc-dev