Merge "Mark an ActivityThreadTest as flaky" into sc-v2-dev