Merge "Expose getTx/RxBytes in TrafficStats" am: 6ef6648cd9

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440245

Change-Id: I69eb11657318438dbe794da849182a08e1847f94