Merge "Skip snapshot tests for non-Virtual A/B devices" am: d7c1bc73dc am: 7eb8d544a8

Change-Id: I598fdbfc3be200e072ad2d673d9e8b29c0e2da94