Merge "Logcatd: remove some extra logic" am: 59772de0f0 am: 1fadcb6e80
am: eb60857be2

Change-Id: Id63e8d43e7b0dc06dcb12d09b6743581a8afca34