[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: 621686a6 -s ours am: 40b8530a -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: I15b4e10651e1e2235a6d8c1f9cbd98f733b1d212
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>