Merge "Update TEST_MAPPING" am: 508ed86f0b am: 3dfeb570f4

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/structopt/+/2125250

Change-Id: Icec80afe18ed5d3bb1655339bf721f74c4d2e036
Signed-off-by: Automerger Merge Worker <[email protected]>