Merge \\\"logcatd: logpersist.start to enable logd service if disabled\\\" am: eb9367f9d4 am: 5dbf514144
am: 2556106c4e

Change-Id: I236ddb26fbb24e5455c3b639d84add47d7dd1fba