Merge "Reading from logd in WRAP mode is expected to take a long time, don't abort it after 30s." am: 974ab46561 am: 9181fe6427 am: 50289204e5
am: 328ba7c8e6

Change-Id: I14f3ccf9a8d2513e53d82408b4e0cc5cd17be6ba