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

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

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