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

Change-Id: I9542d26d1004c6b7ac95678d627963d527544bc5