New Use Mockito 4.6.1 API

Address skipping merge issue

Bug: 236636175
Test: atest ThemePickerRoboTests

Change-Id: I1b41e516094b30e52d1a016a0801a13846611f91
Merged-In: Ie6f34c840d31d24349fd12355f93369f51168802
2 files changed