Merge "Use Mockito 4.6.1 API" into tm-dev am: a124f7c2ba

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

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