Merge \\"logcatd: trampoline persist.logd.logpersistd to logd.logpersistd\\" am: 3ba829c75c
am: 6fb57f996a

Change-Id: I8716e2e0a0c502d0dc8ef050875d48af83877338