Merge "Allow VPN lockdown UID ranges to stack properly" into main am: b15f7d1e68

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

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