Merge "fw/base: work around mockito upgrade issues" into main am: f33f4dbe

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



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