Merge "Settings: trampoline persist.logd.logpersistd to logd.logpersistd"