Merge "Add tagSocket/untagSocket NDK APIs" am: d992ee2925 am: 358573e8a3 am: cfdc49a491 am: 2a30ec9975

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

Change-Id: If5f98e651be5b59753c15dd19fdedf2d67d034e5