Merge "Add ActivityThreadClientTest to presubmit"