Merge "Update TEST_MAPPING" am: 6cb1157574 am: 50f2413874 am: d8c31b14a5 am: 264178f914

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

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