Merge "Merge "Do not run test requiring 3GB free space on devices that do not have it" into nougat-mr1-cts-dev am: 8ba87b0c28  -s ours"