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

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

Change-Id: I065c1f80d2024edcafa144e907bf74da870ab000
tree: 723bad4c257afa0fc39295c0462b4840f5018fe4
  1. core/
  2. services/
  3. wifi/