Update to reflect new mockito semantics. No functional change, no change to test semantics! (cherry-pick of commit afddcc3c9860fecfdb3ed72fafb09d73e8549411) Bug: 36680830 Test: unit tests now passing Merged-In: Ic210f20ce47ab19da25bd0835ae2ee5ae0f73011 Change-Id: Ic210f20ce47ab19da25bd0835ae2ee5ae0f73011