Merge "Update TEST_MAPPING file." am: 8300421bc5 am: fa4f870706

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

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