[automerger skipped] Merge "Move config_apf* resources to NetworkStack" into sc-dev am: 66b0a0361b -s ours am: 498261b15c -s ours am: 82892621e5 -s ours
am skip reason: Merged-In I7a15ddcad5af11fa307d9dbe3a77b31a1179e5b3 with SHA-1 e9836cc431 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14622500
Change-Id: Ib637a385aa6f47a9f9b7c7d2f0541c248c49f6a9
This commit is contained in: