Merge "Update TEST_MAPPING file." am: 8300421bc5 am: 7f71dfabd0

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

Change-Id: I62afff337b267c55f4e1a8cf75cd74dec0c62ef8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>