Merge "Merge "Log sync details to rotating log files (userdebug/eng only)" into oc-dr1-dev am: c4e8720eb2" into oc-dr1-dev-plus-aosp
am: 54805b7467

Change-Id: I8e6c29906a3d5f8814a89ad419146e5b8eff9e4c