Merge "frameworks/base/wifi: configure TEST_MAPPING" am: 804240d840 am: bef16da6aa

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I809963e8ddffed24c22be562822c7e7bf25028f9