DO NOT MERGE: Add more filtering logic for CtsDeqpTestCases on retry

bug:33090757
bug:33211104
Test: run cts, disconnect device after first round CtsDeqpTestCases
Change-Id: Ic7cb9aadf9b4f6f504634eebfa7ef1e787904a75
(cherry picked from commit 17520f7a129bca854d360fabfb047bb4fd3946b9)
(cherry picked from commit a80ec58980ce8268709926490a708d4a93c4e437)
1 file changed