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

Change-Id: Iaf7fe6ba60048daecfde44c8348f68727b245d98