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

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

Change-Id: Ifd16b2ccf8a2fd85d963aa08243385e094aa7c9b