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

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

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