Android N IOT Preview 2 (NIG40)
Merge "Settings: trampoline persist.logd.logpersistd to logd.logpersistd"