Merge "Add a simple test for ConnectivityService#dump." am: 4e9ab4dde0 am: b504fb0b35 am: 5192a78227

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1940840

Change-Id: I9a99634128d4bad7a14b7ebd24265468d5177b1c