Merge "Add mainline skipping to CVE-2020-0437" into qt-dev am: 94f6b03b04 am: 590d1eb683 am: f263dccd06

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

Change-Id: I78e0852e87b053dc64e00ccf604502e2823a1a8e