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

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

Change-Id: I2739873d55b2cff1f5ecc722e1877603ba6e22c6