Merge "Define OBSERVE_NETWORK_POLICY, NETWORK_FACTORY permission" am: a25ff1d82a am: 1fed18a478
am: f8fc8f0e00

Change-Id: Ibce2ffc13abe081c7a255f5df4b497e57680ddb8