Bug: http://b/191166471
Bug: http://b/189438896
This test fails in sc-dev with aosp/1737314. It passes in AOSP and
internal main branch with this change though.
Test: cherry-pick aosp/1737314 and `m nothing`
Change-Id: I4837300b42e2d62a77c698eb04b2f161f693747a
Merged-In: I47e7afeaee3c9124f4231bf0eece7b6844b5313d