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 am: 906b88c7

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



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