Merge "Merge "Use Mockito 4.6.1 API" into tm-dev-plus-aosp am: 203f411f"...

Merge "Merge "Use Mockito 4.6.1 API" into tm-dev-plus-aosp am: 203f411f" into tm-d1-dev-plus-aosp am: f8868e29

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



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