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

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

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