Merge "Revert "logd: validate and fill in socket credentials"" am: c3c598134f
am: 131ddbee00

Change-Id: I5f6007980cc0d09fb995011945075d565d653de4