[automerger skipped] Merge "Fix for testEcAttestation_DeviceLocked" into android10-tests-dev am: c3a2c2f08c -s ours am: 39cd4c87ba -s ours

am skip reason: skipped by user svpawar

Original change: https://android-review.googlesource.com/c/platform/cts/+/1198616

Change-Id: Ic06e9f249534d0ef758bd17992d4c11a1a77b226