Merge "Remove custom android_test.jar disting" am: 6339fba8a8 am: 8049f5cda2 am: 2b221cb6ef

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

Change-Id: Ib57ebd1d648b66caf8e71d617533c66169eb93a3