Merge "Verify lock down related flows" am: f575c79c01 am: ef3f9de521

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

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