Merge "Add NetworkStackPermissionStub definitions" am: 0fe59007ce am: d1a7c18ec6
am: f502776654

Change-Id: Ic4eb53246e7e61f7ebe6ad574a2e96a2cb4eff4b