Merge "Restriction changes of #simulateDataStall" am: 0bb76546e6 am: 4279a667ce

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

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