Merge "packages/modules/Wifi: configure TEST_MAPPING" am: 9882d48414 am: be39e20f02

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Wifi/+/1536753

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iccbf798120829173b96d06a5ca73d806b31d9db1