Merge "Merge "Do not run test requiring 3GB free space on devices that do not...
Merge "Merge "Do not run test requiring 3GB free space on devices that do not have it" into nougat-cts-dev am: 65e0e6e2" into nougat-mr1-cts-dev am: fb7d3730 am: b302a1fc
am: 026d5f54
Change-Id: I967e7c02d63f54e2f91c4380d6187ef261900ac4