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: Ib8d8a7d9f5e8a26d327a9ed0f22f23aac2194400
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>