Merge "Rename NetworkStackPermissionStub"
am: 073e73a0c1

Change-Id: I616fb13add96c3c4708510138a4e920336695239