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

[automerger skipped] Merge "Use Mockito 4.6.1 API" into tm-dev am: a124f7c2 am: 41536ce4 -s ours

am skip reason: Merged-In I0e301b641312f8cc4a235df5ec62acf1446cbb64 with SHA-1 d010065e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20839306



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