[automerger skipped] Merge "Adding Network Tethering Metrics/atoms in the...

[automerger skipped] Merge "Adding Network Tethering Metrics/atoms in the statsd" am: 280471d6 am: 2575b7aa -s ours am: a806e953 -s ours

am skip reason: Change-Id Ia0dc1dd45e006348c3856b483972a4ccd6048d05 with SHA-1 8abf3a7c is in history

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

Change-Id: I4325b02e6bec236d1214736e2bd92b976443c616