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

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

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