Merge "Add priv-app permissions for NetworkStack" am: f012a17962 am: b5d67e5d90
am: 12c6c157c2

Change-Id: I96c955fd22da183d90697bd1bcd34deaa307a693