Merge "LogcatManagerService: Diff timeout for debuggable" into tm-dev