tree f7f9da13d25f7dd9b624dca56870c2c70a6f4a6b
parent fc12688db5b8d514ff0df526efe28711788dda56
parent dc7a325a552adad761b5d3435686911cdc69888f
author Motomu Utsumi <motomuman@google.com> 1701831509 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1701831509 +0000

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>