Merge "Use [set|get]PrivateDnsMode directly" am: 2e7309ffd3 am: aa307b03a9

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

Change-Id: I460d308ab370a662b63a43c7e027e355c7d36130