[automerger skipped] Merge "Remove workaround to remove FlaggedAPI in ump" into udc-mainline-prod am: 49fadd625c -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/+/25497375

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