[automerger skipped] Merge "do not drop ingress dns replies with non...

[automerger skipped] Merge "do not drop ingress dns replies with non bypassable vpn" am: 16a23705 am: 1771ebfe -s ours

am skip reason: Change-Id I8765153c1d7b10970f48bd7e85780f24d2549190 with SHA-1 e2ad8628 is in history

Original change: https://android-review.googlesource.com/c/platform/system/netd/+/1363177

Change-Id: I5488a17d4c224f54d1c1e97da1f1cc0c1b294950