[automerger skipped] Merge "Update CVE-2021-0338 to be dynamic compatible" into rvc-dev am: d54eae887a am: 5ac599ef2f -s ours am: bd9fae0ff7 -s ours am: ea04261dd7 -s ours am: 189debfe5a -s ours am: 59b718b5e2 -s ours am: fa2a6a35b1 -s ours

am skip reason: Merged-In I1595ec5bae3cfc91805c335fa02d76e5f54271ed with SHA-1 ab93c0ae52 is already in history

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

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