Merge "Fix PrivateDnsPreferenceControllerTest test case failed" into udc-dev am: 10129dc9 am: 11a93074 am: 22f05bbf am: bbc0e693

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22930678



Change-Id: I3ee1494b0b30f6fdaf18e5e72f70f1835a47892a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>