Merge "Remove workaround to remove FlaggedAPI in ump" into main am: dc7a325a55

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

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