Fix test failures on sargo. am: 16b9c0b1ab am: bd10c39787

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

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