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: I6dc71fa362331de0c1332b025b1b428c56836fd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>