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

Change-Id: I3df579fb4e1dc9cc51bdc8cd90c5a45a08a611eb