Apply test fix that got left out

A previous cherry-pick omitted a line of a test fix. Reapplying this in
AOSP (the line that's been changed is the same in master)

Test: run unit tests
Change-Id: I46d11b5d0ce31c80cf3cba059f86121e5c5ac59b