Merge remote-tracking branch 'cm/cm-11.0' into HEAD

Conflicts:
	core/java/android/net/NetworkPolicy.java
	core/java/android/net/NetworkPolicyManager.java
	services/java/com/android/server/net/NetworkPolicyManagerService.java

Change-Id: I2ee6e6200a8cffef5b7b68a3ecdf3c23a71d79de