[automerger skipped] Merge "logd: disable flaky logd.timeout test" into rvc-dev am: 090eb403 -s ours
am skip reason: Change-Id I0cd953955f613e40d17df73f70543d7d2f0925b6 with SHA-1 25a4d708 is in history
Change-Id: Ibfb2711a855727691dea22536b68e7c071127116