Merge "Move ActivityThreadTests to presubmit" into sc-dev