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

Change-Id: Ia06653e6c1cccddcd2de17dd88a9ef47263f5c79
tree: a98087c6911c593dc3ce990dbdb8b3d60f10ffd4
  1. core/
  2. services/
  3. wifi/