[automerger skipped] Merge "Move TrafficStats tags for the network stack constants" am: d2eb7f71b8 am: 2c28ee4cb8 -s ours
am:19a6b5c027-s ours am skip reason: change_id I4882686a86e7c6d42f4b0619b921d02619ed6d4c with SHA1cf0e250114is in history Change-Id: I3e682721ed3e8a574d84d12baf84cc2d6c097412
This commit is contained in: