Merge "Merge "Check NetworkStack UID and perms before binding" am: c96b852f46 am: 89b04a01c2 am: a7070d3485"