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

Change-Id: I8122564dd3795020dd0ad13cb115bf27e1c4e3e3