[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 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: Ibab771f969e41dd851a17e5587bc6729b66af42d