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

[automerger skipped] Merge "Use Mockito 4.6.1 API" am: 59b496c3 -s ours am: 0e6426ad -s ours am: f520737e -s ours

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

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



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