[conflict] [conflict] Merge "Use Mockito 4.6.1 API" into tm-dev-plus-aosp am:...

[conflict] [conflict] Merge "Use Mockito 4.6.1 API" into tm-dev-plus-aosp am: ac6af411 am: 326c0ea3

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



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