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

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

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