[automerger skipped] Merge "Correct field names and data types for apf atoms in networkstack" into main am: 7e823360fc am: 2334b0cb5c -s ours am: 180bc71afc -s ours

am skip reason: Merged-In I20857041a0d8aa8e829208a44208b8a1ddd14bd8 with SHA-1 0879358372 is already in history

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

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