Merge "Update CVE-2021-0338 to be dynamic compatible" into qt-dev am: 2fc3484bc5

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

Change-Id: I1289bd334110afaf8ebfa634129eb9bd3e72c381
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>