[automerger skipped] Revert "Use Mockito 4.6.1 API" am: 869fd2f33e
-s ours
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c
is already in history. Merged-In was found from reverted change.
Reverted change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20749597
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20878385
Change-Id: I2dd83ff0750ae656a6c6bf916437bd107c172940
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: