Merge "Update TEST_MAPPING" am: 6cb1157574 am: 50f2413874

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

Change-Id: I9458bdade1ec48dc5ed51f2966e951869b43b06c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>