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

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

Change-Id: I3a9f55e09d4dd452445bee3b834f23ce2e98fbbd