tree 3c3b875dd758653b35b290564f1c41852a178c09
parent 64c37657172636ff510e665f33a53fb505090a9c
parent 478d85ed378d2dda68f1a732d91354bbf9fc6a8b
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583897069 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583897069 +0000

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