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
Change-Id: I0b188fcfb606d6e90ec9a7ad446a5e2da2050ca3