Merge "Add TrafficStats methods to public APIs"
am: 8aed6e69f0

Change-Id: Ifc4bd75a3d1fbafbe666842223c914ca9b42a6df