Merge "logcatd.rc: only deliver on eng and userdebug"