Merge "Merge "[CHERRY-PICK] API for apps to tag sockets with their own UID."...
Merge "Merge "[CHERRY-PICK] API for apps to tag sockets with their own UID." am: bef8c596 am: 826657a9" into oc-mr1-dev-plus-aosp
am: 11448df5 -s ours
Change-Id: I3289c409e2014c898cba8ba14768ea174937ffed