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

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

Change-Id: I2ed2b34cc43b7822e82aaa8482d1c6dfdbe9c4e3
tree: ec787b74c22c93c02615925798b5dbfafbf7978c
  1. tests/
  2. Tethering/