Merge "Define OBSERVE_NETWORK_POLICY, NETWORK_FACTORY permission"
am: a25ff1d82a

Change-Id: I85103473d3b79f39dc104104a96a24ed15656897