[automerger skipped] Merge "Use [set|get]PrivateDnsMode directly" am: 2e7309ffd3
am: aa307b03a9
am: b6e2b4239c
-s ours am: e5fcc54bfc
-s ours am: 209df66539
-s ours
am skip reason: Merged-In I47706efe9c53a00438fdec97fda244638cecb3dc with SHA-1 188d66a709
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1675475
Change-Id: I4c4b8d4bec9647fbd0948cf440bacb03183cfd12
This commit is contained in: