Follow-up to commit 3fec9ac0. Bug: 31338270 Test: m test-art-host Change-Id: Ia50f450bef144167b946224c26242c529302996e