Merge "Delete some legacy AndroidTest.xml config" am: 95fbcb6a79 am: 582ed1ba80 am: ace914358a am: a7d5a621ea

Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/1598337

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1f014bd6686af59bf9933286b8a4182002b8633a