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

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

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