Merge "Attempt to reduce flakiness of ActivityThreadTest"