Merge "Revert "Skip testEcAttestation and testRsaAttestation if device has no lock screen"" into rvc-dev