Merge "Revert "[automerger skipped] Merge "Use Mockito 4.6.1 API" into ..."" into tm-qpr-dev-plus-aosp