Merge "logd: disable flaky logd.timeout test"