Merge changes from topic "revert-3502139-revert-3500336-HUZKQGRTWV-COERBZPUTD" into main am: 485a8bf69f Original change: https://android-review.googlesource.com/c/platform/external/mockito/+/3501459 Change-Id: I4d47aedad293d12eb1bb3677a34a7943879f0e68 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>