Merge "Skip snapshot tests for non-Virtual A/B devices"