Merge "logd: clear timeout if no start time is given"
am: 5336d40ed4

Change-Id: Ic51bd6b029ef3c6dad1518f9e88cbbf29ea32a06