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

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

Change-Id: I9977a0109920693cf721d7f4e231fff05fbe5d74