Merge "Add tagSocket/untagSocket NDK APIs" am: 8fc5367b3f am: f32288186b am: 0a506939d0 am: 68207fd748

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1940493

Change-Id: I70bac3fd2c43fb56c9b23659561b20c069f14e8f