[automerger skipped] Merge "Move TrafficStats tags for the network stack constants" am: 8f6e99b370 am: 4a92ec452f -s ours
am:c9d83b455f-s ours am skip reason: change_id I4882686a86e7c6d42f4b0619b921d02619ed6d4c with SHA172172969ccis in history Change-Id: I3e682721ed3e8a574d84d12baf84cc2d6c097412
This commit is contained in: