Merge "Fix test data to use my_test_data_file_pairs" into main am: faa072b9 am: ec6a3c91 am: be05c0e9

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



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