Merge "Revert "DO NOT MERGE] Disabled the following tests:"" into stage-aosp-master