Merge "Remove flaky annotation of ActivityThreadClientTest"