Merge "Make AlmostFullTest no longer overfill the disk." into nougat-mr1-cts-dev