[automerger skipped] Merge "Adding NetworkStack Metrics/atoms" am: fb5e5063f3 am: 6a37393376 -s ours am: f8398fafc6 -s ours
am skip reason: Change-Id I1268bdbee11a704705d466567e8ba09748b03bb6 with SHA-1 1cc318d050 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1295356
Change-Id: Ifb75f54e0946595d9f8174d57093c328c632f299
This commit is contained in: