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

Change-Id: Ia9d4718162ed9534c5f61a9be0e8654026b902c8