Merge "[CHERRY-PICK] API for apps to tag sockets with their own UID."
am: bef8c59634

Change-Id: I38da928c8484eb0bbb5d9cbc473d6d36de35e1e8