Merge "Merge "Skip testEcAttestation and testRsaAttestation if device has no lock screen" into oreo-mr1-cts-dev am: 3790135df3" into pie-cts-dev am: 92a6ee7671 am: 478d85ed37

Change-Id: Iacb71bdb6f093a8183c82059b26ee9775b6ce480