Merge "Add test mapping to avoid running @FoldableOnly scenarios"