Android N Preview 5 (NPD90G)
Merge "Settings: trampoline persist.logd.logpersistd to logd.logpersistd"