Merge "[Ravenwood] Make sure Mockito actually works" into main am: ea4fb3354d

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

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