Merge "Fix: Firewall: NMS inverts default rule behavior" am: 627b64593d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2439712

Change-Id: I65ccc01b795fa53a51d211fabd2ea4063b0807d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>