[automerger skipped] Merge "Revert "DO NOT MERGE] Disabled the following tests:"" into stage-aosp-master am: 14610cc78b -s ours am: fb900000b2
am: 6bb165f270

Change-Id: I2d0d188315a6cc51db9f2d1916f6c8459e653429