[automerger skipped] Support test runnner option in auto generated test...

[automerger skipped] Support test runnner option in auto generated test configs am: be0dee88 -s ours

am skip reason: Merged-In Ifae3d556ff79153ca6c3067347fc259b665fb2e1 with SHA-1 ec731433 is already in history

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



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