[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 36fd98c382 -s ours

am skip reason: Change-Id I1634dc6e15698465b63881dfcfbb6c86bbd93e2f with SHA-1 9eee099922 is in history

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

Change-Id: I7dcc126543f553b6230c961f300f7e2094a855c8