Merge "logd: disable flaky logd.timeout test" into rvc-dev am: 090eb40355 am: 45339b236d

Change-Id: Iffa181f87f782d6f228906580c133a46152da989