Merge "Support strict mode private DNS on VPNs that provide Internet."
am: a56eab41a6

Change-Id: I6522706917731a944483ad3cb9cdbc20447be6c2