Merge "Merge "Support test runnner option in auto generated test configs" into...

Merge "Merge "Support test runnner option in auto generated test configs" into android14-tests-dev am: 7b944b62" into main am: 59dad11f am: 3cea02b6

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



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