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

[automerger skipped] Merge "Use Mockito 4.6.1 API" into tm-qpr-dev am: cb8c1c6c -s ours am: 8e2f0b97 -s ours

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

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



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