Merge "Remove hidden connectivity APIs in statsdapp tests"