[automerger skipped] Merge "Allows Test Data Elements with Filter" into tm-mainline-prod am: 0f45c05797 -s ours

am skip reason: Merged-In I2d0a537d38ac7b602bc49dcf2113c43f1b654cb2 with SHA-1 ca54255b85 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/21234305

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