Merge "Split out NetworkStack and Tethering permission"