tree f07e5d8003c9b051a210f49994ebbf85c4f53db7
parent 0dd52c888f88216dbf32e14fa7de192bb32e0e6e
author Adrian Roos <roosa@google.com> 1740346814 -0800
committer Adrian Roos <roosa@google.com> 1740346814 -0800

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