[automerger skipped] Merge "Adding Network Tethering Metrics/atoms in the statsd" am: 280471d6d1 am: 2575b7aa1d -s ours am: a806e9536a -s ours am: 3d27e629d5 -s ours
am skip reason: Change-Id Ia0dc1dd45e006348c3856b483972a4ccd6048d05 with SHA-1 8abf3a7c23 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1295362
Change-Id: Iebaaecb13f92e10af67e7271d31f1c8be9f7ac73
This commit is contained in: