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

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

Change-Id: I065c1f80d2024edcafa144e907bf74da870ab000