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

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



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