Merge "Add alias for mockito-core naming scheme" am: 9241a45d30 am: 33de180a1a

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

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