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

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

Change-Id: Ibf59d43165b336b52030103a3e9e3b95872197c8