Merge "Fix PrivateDnsPreferenceControllerTest test case failed" into udc-dev...

Merge "Fix PrivateDnsPreferenceControllerTest test case failed" into udc-dev am: 10129dc9 am: 11a93074 am: 7dfbfcc9

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



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