Improve testing of CONNECTIVITY_ACTION broadcasts. am: 4a66aedf09

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425315

Change-Id: I889026eec095745be2e88f0c38392619c8ae6cfd