[automerger skipped] Merge "Have a new API to get private DNS mode" am: 179ecda6 am: 114103ea am: 3373b94c -s ours

am skip reason: skip tag Change-Id I02a1e91b4eafb5f5df3eada1c07b99849a050c3c with SHA-1 b19b6573 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620860

Change-Id: I45f348a3d0105f07441c8aabc226a12ee6a9e89c