Merge "Correct field names and data types for apf atoms in networkstack" into main am: 7e823360fc

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

Change-Id: Ib6922e02ea6d3ae96bdd04db9a4193fadfe80b13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>