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

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

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