Merge "Remove repackaged.android.test... libraries" am: e04ce88a46 am: eeb6eada87

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

Change-Id: I9f7413b296c61f8792d4ff36cc10d39f4926ccdc