[automerger skipped] Merge "Ignore @FlaggedApi annotated API in udc mainline branch" into udc-mainline-prod am: b058107c82 -s ours

am skip reason: Merged-In Ib69d2fdc1d73b36a08a3d8ae1f2c45b2bcffae64 with SHA-1 6535fabb3f is already in history

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

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