Merge "Fix PrivateDnsPreferenceControllerTest test case failed" into udc-dev am: 10129dc9

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



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