Merge "Move the logic of (re)evaluation of Private DNS"
am: 04233ef175

Change-Id: Ic510dabd6a2d40cd6d33a21e0128d85a0126127f