Fix test failures on sargo. am: 16b9c0b1ab

Original change: https://android-review.googlesource.com/c/platform/art/+/2968599

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