Android S Beta 1
Merge "Delete some legacy AndroidTest.xml config" am: 95fbcb6a79

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iddefd139b0d3faa37addbeb01aa4a872f27ea165