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

Change-Id: Ifb2267137e48b643e934997612b7b4f083925786