DO NOT MERGE: Cherry-pick the following missing commits from nyc-mr1-dev

prior to b/33090058, which was lost as a result of merge
b70b7f82:

c27c91e8 Erik Wolsheimer: Do not run test requiring 3GB free space on
        devices that do not have it
177835ad Nimrod Gileadi: Don't run Annotations57649Test on low-ram
        devices.

BUG: 33090058
Change-Id: Ic11788e9d84e212bc29cb6707702f2c41bf53086