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

Change-Id: Ida4967d22f0781524f0f269e30e653b8ec867258