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

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

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