Merge "Move TrafficStats tags for the network stack constants"
am: 2a9f0c45f4

Change-Id: I13ba9e3077bb4ec28229a09f2d4747a43c281bcc
tree: 6de662633af1ee39949727fba60681a4662b7a07
  1. core/
  2. services/
  3. tests/