Merge "Move network policy to per-appId (instead of UID)."