Commit 0e6426ad authored Jul 20, 2022 by Sorin Basca Committed by Automerger Merge Worker Jul 20, 2022

[automerger skipped] Merge "Use Mockito 4.6.1 API" am: 59b496c3 -s ours

am skip reason: Merged-In I0e301b641312f8cc4a235df5ec62acf1446cbb64 with SHA-1 aceee687 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>

There are no changes