[automerger skipped] Merge "Move the logic of (re)evaluation of Private DNS" into pi-dev
am: 9b43bdba19  -s ours

Change-Id: I9a83aad484e84039fafb570cf5c63630144204d5
tree: e59a921b697cb7914c62980c32e544ab3a373775
  1. core/
  2. services/
  3. tests/