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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7136ddafdb85b14a16a85109942a497b3d209241