[automerger skipped] Merge "Use Mockito 4.6.1 API" into stage-aosp-master am: d88ed633 -s ours

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

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



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