[automerger skipped] Merge "Use Mockito 4.6.1 API" into tm-qpr-dev am: df30e8a4 -s ours

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

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



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