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

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



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