Merge "Add NETWORK_STACK permission" am: b23fabf3fd
am: 09146fc440

Change-Id: If0ebaea53188d008ce1cf81ac4f3356c9943dad8