[automerger skipped] Merge "Add mockito helpers" into sc-v2-dev am: 9d9ea2c0...

[automerger skipped] Merge "Add mockito helpers" into sc-v2-dev am: 9d9ea2c0 am: d0e307dc -s ours

am skip reason: Merged-In Ie4f8d503f413da4afd06a21d1d74f1bb43d25433 with SHA-1 e20cff8f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16140983

Change-Id: I0ac6f77fefad905a1fa62830241e5260ad57ea6f