tree b1813bc390e8609d20f32b09d96a15c737185834
parent fc0f7c6449bfbcecc186b22e05af2c3a5f84e39b
parent 08226c80b1c75d9f20cba89f45bf538744f76246
author Frank Li <lifr@google.com> 1592619662 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1592619662 +0000

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

am skip reason: Change-Id Ia0dc1dd45e006348c3856b483972a4ccd6048d05 with SHA-1 95292ebd8d is in history

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

Change-Id: I02864f0c9510910495d9eb3ba71774aa09de23a3