Merge "Do not release prefix too early" into main am: 6d41b0b77b

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

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