[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 -s ours
am skip reason: Change-Id Icad439efa2ab4c872c21d3ee6ceaae8c5b49f18d with SHA-1 5228aad2 is in history
Change-Id: Idb6ea8087b39242e1bab79d7227107303a81f59d