Merge "Keep only the classes in the android.test.mock package" am: 70a0869f49 am: 90e0a894eb am: 698d3666ef

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

Change-Id: I8102c75bd39223ed50a958a44dfad3defcae4742