Merge "Add a simple test for ConnectivityService#dump." am: 4e9ab4dde0 am: 1604e7cc0c

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

Change-Id: I2c9e379b4a5f37a39adfc69c9d0a93baf97c01b1