Merge "Mark HostsideConnOnActivityStartTest#testStartActivity_doze as flaky." into tm-dev