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

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

Change-Id: I63057545acf25a12718c3f570083a08ffb4bd333