Merge "Add aconfig flags for Connectivity FlaggedAPI annotations" into main am: 8c951c32df am: b430f54b5d

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

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