Merge "Skip testEcAttestation and testRsaAttestation if device has no lock screen" into oreo-mr1-cts-dev