Merge "Revert "Revert "Generate stable version of NetworkStackStatsLog""" am: c0577710ec am: dbcc6c2f41

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idd7407c7375fc3462e53be4a1cf4ed80e0c23fff