Merge "Update connectivity TEST_MAPPING" am: 7960575fab am: 218ac93535 am: 10b5b3f2fb am: 4697d98a78

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

Change-Id: Iba6074879cd4dd6806e294683648ba13e9b4dc29