Merge "Rename NetworkStackPermissionStub" am: 073e73a0c1
am: 63d998d859

Change-Id: Iffecb9d56fe90d9c62e963c2c38094f0c2b21f39