[automerger skipped] Merge "Use Mockito 4.6.1 API" am: 59b496c31d -s ours
am skip reason: Merged-In I0e301b641312f8cc4a235df5ec62acf1446cbb64 with SHA-1 aceee6876a is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2152642
Change-Id: I6003cad31908ab06bf6c2b44c62f586d4192d93b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: