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

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

Change-Id: Iaf360b6bc73d60b65fc20678ecd823b0d5b4f480