Merge "Revert "[automerger skipped] Merge "Use Mockito 4.6.1 API" into ...""...

Merge "Revert "[automerger skipped] Merge "Use Mockito 4.6.1 API" into ..."" into tm-qpr-dev-plus-aosp am: 9a822069 -s ours

am skip reason: Merged-In I0e301b641312f8cc4a235df5ec62acf1446cbb64 with SHA-1 d010065e is already in history. Merged-In was found from reverted change.

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

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



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