aml_hef_341114030 (10906182,com.google.android.healthfitness)
Merge "Add alias for mockito-core naming scheme" am: 9241a45d30 am: 33de180a1a am: d033d9ff9e

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

Change-Id: I6c290b77dfc3bfacd8f2aa32c0def257bef8c729
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>