[RESTRICT AUTOMERGE] Fix CVE-2021-1906

Bug: 183944574
Test: sts-tradefed
Change-Id: I3c1057d42ccf390edeea3720df186f499d4fde28
2 files changed