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

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

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