[automerged blank] Address some mockito upgrade api change 2p: 6d5b67d4c6

Blank merge reason: Change-Id Ie6f34c840d31d24349fd12355f93369f51168802 with SHA-1 ec84e746ef is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/20981770

Bug: 239218521
Change-Id: Ib3a4d583aa9dc8dee49c4d151edbc973c9aad4de
Merged-In: Ie6f34c840d31d24349fd12355f93369f51168802