Merge "Support routing sockets as another user" am: cd7b82033d

Original change: undetermined

Change-Id: Ia99844b9e2dc9035468561a19c7e91d0c8b4cddf