[automerger skipped] Merge "Adding NetworkStack Metrics/atoms" am: fb5e5063...

[automerger skipped] Merge "Adding NetworkStack Metrics/atoms" am: fb5e5063 am: 6a373933 -s ours am: f8398faf -s ours am: 664574ae -s ours

am skip reason: Change-Id I1268bdbee11a704705d466567e8ba09748b03bb6 with SHA-1 1cc318d0 is in history

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

Change-Id: If60b6e62f9ec0507b31c8288424d41c2fee5e6cc