[automerger skipped] Merge "packages/modules/Wifi: configure TEST_MAPPING" am: 9882d48414 am: be39e20f02 am: b783217f7e -s ours

am skip reason: Change-Id I5d72e62c9cb8cc0c63cb99d847cf3efbaffab079 with SHA-1 b77191bc3c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I16e50ea9128f0cbcef021cdd338b5a7556e84daf