Merge "logd: disable flaky logd.timeout test" into rvc-dev