Merge "Drop dependency of android.test.mock -> android.test.base." am: f08e8871d4 am: 72003fb685

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

Change-Id: I1f396f7d3e6af15c236ece54d7b2decb07c09b51