[automerger skipped] Merge "Adding NetworkStack Metrics/protos in the...

[automerger skipped] Merge "Adding NetworkStack Metrics/protos in the Networkstack" am: 8306c946 am: 2370f4af -s ours am: 5f4f3cbc -s ours

am skip reason: Change-Id I6cb6e8d94ee6ac4bc302646047fb824448c5f543 with SHA-1 1995d8e3 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1316100

Change-Id: I051056d2f7895dbd92ae4e65974fad11895cd831