Merge "Create TEST_MAPPING for com.android.internal.net" into main am: aa33aca942 am: 2b12f8fbc4 am: 063e85e541

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

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