Merge changes from topic "TrafficStats.getTxRxBytes" am: 42fbb57b31

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1490181

Change-Id: I93a1a017b55c30ba08da434a05c1335719ffcbcd
tree: 40f475f2eeee93572eb0d5c31344f77ca8e094b1
  1. tests/
  2. Tethering/