Merge "Add tagSocket/untagSocket NDK APIs" am: d992ee2925

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

Change-Id: I58aa4e27e1ac39641d1afaec4ef7ac527557c886