[automerger skipped] Merge "Fix: Firewall: NMS inverts default rule behavior"...

[automerger skipped] Merge "Fix: Firewall: NMS inverts default rule behavior" am: 627b6459 am: 93da655f am: 5b01bccb -s ours am: 4bd4f105 -s ours

am skip reason: skipped by user sudheersai

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



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