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