Address some mockito upgrade api change

Also corrected the run_robotests.mk version to run the test

Test: atest ThemePickerRoboTests

Bug: 239218521
Change-Id: I3ce6061915988cf62d93ec4aa55ae21013acb001
Merged-In: Ie6f34c840d31d24349fd12355f93369f51168802
3 files changed