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

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

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