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

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



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