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

Change-Id: I6db70a9148755de4494fdb951dce1c946995f5df