[automerger skipped] Rewrite test data logic to make it faster am: e88ef929...

[automerger skipped] Rewrite test data logic to make it faster am: e88ef929 am: a83940a7 am: ff00eea9 -s ours

am skip reason: Change-Id Ia2ec8b29b5c1dd12fa7ea10b4f80fe802c692725 with SHA-1 e88ef929 is in history

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

Change-Id: I25309c84703d0ae525268b23f82b5ee31b3a5947