Revert "Revert "mockito: work around re-entrant stubbing of andr..."

Reapply "Upgrade Mockito to v3.12.4"

Reverted changes: /q/submissionid:3502139-revert-3500336-HUZKQGRTWV

Change-Id: I20345d824796760ac154414bfb07e9623527b6a0
2 files changed