[automerger skipped] Merge "Use flags.aconfig in platform for android...

[automerger skipped] Merge "Use flags.aconfig in platform for android networking" into main am: a62f09d2 am: 0000f3eb am: 28cd0e84 -s ours

am skip reason: Merged-In I7142d937a59a880b68c11fff9254c84b39ce072f with SHA-1 65e2f1d9 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2861288



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