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

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

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