[automerger skipped] Merge "Add NDK API for getprocdns, setprocdns" am:...

[automerger skipped] Merge "Add NDK API for getprocdns, setprocdns" am: 0e466d69 am: cbbe7f9a -s ours am: 9184d50e -s ours am: 31fc1b1b -s ours

am skip reason: Merged-In I70d8113ae49cd1e0910a6dbc5929b6a157c44f42 with SHA-1 4729949b is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1722537

Change-Id: Ie66ab8ecfada0c3514d88775cd1014435afc6ce0