[automerger skipped] Merge "Create TestApi for simulating a Data Stall on ConnectivityService." into rvc-dev am: aa921179de am: 8ed473a5e6 -s ours am: 9b3c05e670 -s ours
am skip reason: Change-Id Icad439efa2ab4c872c21d3ee6ceaae8c5b49f18d with SHA-1 f4a7e96585 is in history
Change-Id: I3e4262c358cf911c637dd518730ce4274efab587
This commit is contained in: