Merge "logcatd.rc: only deliver on eng and userdebug" am: 11aebd8c9a
am: 9bc3b93c6a

* commit '9bc3b93c6a88b460908357a8bc65d0b66552c681':
  logcatd.rc: only deliver on eng and userdebug