[automerger skipped] android_test handles test_options.tradefed_options am: 3e2bf84c -s ours

am skip reason: Merged-In I673360e12713b8e30739bce471371ff9347c6f55 with SHA-1 f528b70e is already in history

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



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