[automerger skipped] Merge "Have a new API to get private DNS mode" am: b79ae17835 am: 0839a2791b am: 3373b94c0d -s ours

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

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

Change-Id: I45f348a3d0105f07441c8aabc226a12ee6a9e89c
tree: 9e42f315ce0cece2426785c1f156d712bd0e51ed
  1. framework/
  2. service/
  3. OWNERS