Merge "Add NETWORK_STACK permission" into oc-dev
am: 087daa0da5

Change-Id: I4eb02f88b6fecc92539516c859a07d61ffecd86e