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