Merge "Update connectivity TEST_MAPPING" am: 7960575fab

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

Change-Id: Ibdbf3af0e113523339e09eceaef24e951a617093