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

Change-Id: I5fdaeb0060d71343d0f78832ea001ec076c755aa