Merge "Revert "Reland "Mark goldfish_setup as vendor_executes_system_violators.""" am: e1353d9228 am: 8ac52a1fca
am: aa1ec2400d

Change-Id: I16b95074159e44aa9b0333589801c4970a37faf6