[automerger skipped] Merge "Fix NetworkPolicyManager unit tests." am: da3518bc6b am: 1381de466a
am: 069e57e0aa -s ours
am skip reason: change_id I38a935c71bfb1f78739d508b400e43dc1b52bef5 with SHA1 c0f85c1001 is in history

Change-Id: I82d19203d378286eb994e7ebf52bc893d928a2ca