[automerger skipped] [conflict] [conflict] Merge "Use Mockito 4.6.1 API" into...

[automerger skipped] [conflict] [conflict] Merge "Use Mockito 4.6.1 API" into tm-dev-plus-aosp am: ac6af411 am: 326c0ea3 am: 91aec69f -s ours

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

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



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