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

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

Change-Id: Ia93a3556b209aa214233952b838c2e0ca3aeaddb