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

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

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