Merge "Create TEST_MAPPING for com.android.internal.net" into main am: aa33aca942 am: 78c70d3e41

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2855538

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