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

Change-Id: Ia63a128d2a9d8315d26a3e593b51450ca0fd0c91