Fixing tests that did not get updated earlier

The change https://android-git.corp.google.com/g/#change,45372
broke the tests.  I have verified that it's the tests
and not the tested code that is broken.

Bug: 2524876
Change-Id: Iaa3d1012bef301d09562793b0adac8888be2c783