[automerger skipped] Merge "Update PrivateDnsMode from StringDef to IntDef"...

[automerger skipped] Merge "Update PrivateDnsMode from StringDef to IntDef" am: 1742bf02 am: eb6daaa8 am: 9df8482c -s ours am: 9694940b -s ours am: 957e60ef -s ours

am skip reason: Merged-In I23e7ec140066979726d769cabc5f7057bb2167e6 with SHA-1 56451e28 is already in history

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

Change-Id: Ibbfbf5b1ba8d3193dcb5b5622199420aa4182712