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

[automerger skipped] Merge "Add NDK API for getprocdns,setprocdns" am: a2f8b410 am: dcc6958c -s ours

am skip reason: Merged-In I42f0d9b17b3058f6e10fd2e651278b290f26667f with SHA-1 86ae725f is already in history

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

Change-Id: Ia1438ce464ca7394c3d9ca7d1b2e20d5d6cf6653