[automerger skipped] Merge "Create TestApi for simulating a Data Stall on ConnectivityService." into rvc-dev am: 8ed33c51f1 -s ours am: 49ea39e137 -s ours am: f62cbeaf8d -s ours
am skip reason: Change-Id Icad439efa2ab4c872c21d3ee6ceaae8c5b49f18d with SHA-1 9ddf8a5953 is in history
Change-Id: Icdad1a09f60a11cbf9dc8e49dd4565f370da8ec5
This commit is contained in: