[automerger skipped] Merge "Create TestApi for simulating a Data Stall on...
[automerger skipped] Merge "Create TestApi for simulating a Data Stall on ConnectivityService." into rvc-dev am: a611e762 am: edc35fd8 -s ours
am skip reason: Change-Id Icad439efa2ab4c872c21d3ee6ceaae8c5b49f18d with SHA-1 5228aad2 is in history
Change-Id: I92ebe59e56a221d9f998286dc9a6d8d1993b12a0