Android U Beta 1 GPL
Merge "Add alias for mockito-core naming scheme" am: 9241a45d30

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

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