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

Merge "Support test runnner option in auto generated test configs" into android14-tests-dev am: 7b944b62

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



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