[automerger skipped] Merge "Add NDK API for getprocdns, setprocdns" am: 0e466d69fa am: cbbe7f9acd -s ours

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

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

Change-Id: I0b684631a4d2ae820f9e62df6942ca0812293345