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

Change-Id: I3a9930af61e97d2ca6292ae131225e76beacc398