Merge "Adding Network Tethering Metrics/atoms in the statsd" am: 280471d6d1

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

Change-Id: I0739b747b4227d50321674e8ad4fbaf73706a528