Android S Beta 2 (SPB2.210513.007)
Merge "Adding an SDK check so these tests won't be run <S"