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

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



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