Merge "Really expose the new NDK socket tagging functions added in T." am: cba72fc987

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

Change-Id: I5be97f53054d23e68a8999d8e295a00bedc28b8d