[automerger skipped] Merge "Remove aconfig flags for Connectivity FlaggedAPI...

[automerger skipped] Merge "Remove aconfig flags for Connectivity FlaggedAPI annotations" into aosp-main-future am: 771b0b47 -s ours

am skip reason: Merged-In Ie8e0f911d0f7d7e81d108b8e8ab539b29a255ad0 with SHA-1 e54434ca is already in history

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



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