Merge "Update net/TEST_MAPPING to run more tests in presubmit." am: ff7bc1e803

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

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