[automerger skipped] Merge "Use Mockito 4.6.1 API" am: 6a043ec5 -s ours am:...

[automerger skipped] Merge "Use Mockito 4.6.1 API" am: 6a043ec5 -s ours am: 5781b7ab -s ours am: 0085dcc8 -s ours am: b9cd87f4 -s ours am: fec750d9 -s ours

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

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



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