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

Change-Id: I1c51330769982bda48d2a9d65dc76c180d0450bb