Merge "Merge "Merge "Do not run test requiring 3GB free space on devices that...
Merge "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" into oreo-cts-dev
am: 37922cfd
Change-Id: I0b6e408162a0e35b97e113cb760c71baad518d2f