Merge "Move more test data into separate v1/v2 folders." into main am: 08e73d8019 Original change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3294491 Change-Id: I4274da33faddfca41a747d58ef092863ac2652bb Signed-off-by: Automerger Merge Worker <[email protected]>