Fallback to non-variant match if nothing matches

Bug: 310117531
Test: atest CtsGraphicsTestCases CtsTextTestCases CtsWidgetTestCases
Change-Id: I574b641e50e8f2bc03c7490c0199697e79d81aa2
2 files changed