Merge "Make AlmostFullTest no longer overfill the disk." into nougat-mr1-cts-dev am: af99dba399 am: 1c4bd09054 am: 4f3a880ecf
am: 4c19b6f943

Change-Id: I04f1a02f6255558d2e70f4e8a073a8a34dc6fff8