[automerger skipped] Merge "Add NDK API for getprocnetwork" am: 37bc6b57 am:...

[automerger skipped] Merge "Add NDK API for getprocnetwork" am: 37bc6b57 am: b949d4dd -s ours am: 656aef17 -s ours

am skip reason: Merged-In Ie8f68cf1fa57deddb63324c1abf3d6fd5b0ef500 with SHA-1 3d50059b is already in history

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

Change-Id: Ifeaf6191bbd8d4ed395e306abc09aee9c0436806