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

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

Change-Id: Ided901188cdaee6a0bc7cafe751e9344bcba8d9b