Merge "Split out NetworkStack and Tethering permission" into sc-dev