Merge "Update AndroidTest.xml to be APCT suite ready" into pi-dev am: 51edfcf62b
am: f0b49aef25

Change-Id: Icd13602615f02a09411b7b82c7333864ae702bf5