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

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

Change-Id: I4489721fe75ccc8e89d954f911bbe9ffb27e590c
tree: d6f515f65726b3bae4eb55e8faa9eb4eddea3906
  1. tests/
  2. Tethering/