Merge "Logcatd: remove some extra logic"
am: 59772de0f0

Change-Id: I2a3968842c7055f685a5d708beebcbb6a34d6ce7