Merge "Add NetworkStackPermissionStub definitions"
am: 0fe59007ce

Change-Id: I0cd613b09160f7a8f223bd2ec5ab29a85c219f66