Merge "use extra test props when generating the AndroidTest.xml" into main am:...

Merge "use extra test props when generating the AndroidTest.xml" into main am: fd4465f8 am: 4e66edd8

Original change: https://android-review.googlesource.com/c/platform/build/+/3449514



Change-Id: Ib4f1d216d9b9cd48afc1000473b80907ecd4a715
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>