[automerger skipped] Merge "Use Mockito 4.6.1 API" into tm-dev am: 521278a0...

[automerger skipped] Merge "Use Mockito 4.6.1 API" into tm-dev am: 521278a0 am: 2d0ad562 -s ours

am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e81d98cc is already in history

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



Change-Id: Ifa0094671af47968f9ba98c78812b9be423cf0a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>