Merge "logcatd: logpersist.start more descriptive warning" am: dad158f3a1
am: 2c1322f751

Change-Id: I9af477d21332276bb14e535f4a64d708fc7a0e8e