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

Change-Id: I1b4391d5777b3e6db596e422faf53e4959f3dd18