Merge "services.net-module-wifi: Add TEST_MAPPING" am: 0885cc3db9

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

Change-Id: I16f353fc9eaa686f1983b9a99df8055f0c265621