Refactor code incompatible with Mockito 2.7.13

Bug: 32912773
Test: make checkbuild
Change-Id: I3ecc0b800875fd614582d4ecd53f9d0a368160ba
1 file changed