Merge changes from topic "revert-3499701-revert-3495771-upgrade-mockito-ONHERLZGCH-WJXLGYIWAH" into main am: 457f110d9d

Original change: https://android-review.googlesource.com/c/platform/external/mockito/+/3500336

Change-Id: Ib6162801636c877dcbbb0f0881bfc4a632acb2c5
Signed-off-by: Automerger Merge Worker <[email protected]>