am 7480c007: am b2639f40: Merge "Label sockets consistently with the seclabel value if specified."

# By Stephen Smalley
# Via Android Git Automerger (1) and others
* commit '7480c0079d8c7fcfd5b3d9decfdabfebde162781':
  Label sockets consistently with the seclabel value if specified.