Merge "Improve testing of CONNECTIVITY_ACTION broadcasts."