Address review comments from aosp/2671457. am: b7dc01d1e4

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

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