Merge "Add aconfig flag file" into main am: 5ce65cd53b am: d55acb1c24 am: c2eacc2037

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

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