[automerger skipped] Merge "Move config_apf* resources to NetworkStack" into...

[automerger skipped] Merge "Move config_apf* resources to NetworkStack" into sc-dev am: 825ebc0e am: bcfe90a6 -s ours

am skip reason: Merged-In I087287b6cedbf931c02d5696ad9bcbafa40fc660 with SHA-1 2cd4316c is already in history

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

Change-Id: I870e629c7f70b9e41747c145dfbb6d6af9dacc65