Merge "Upgrade rust/crates/thiserror-impl to 1.0.22" am: 559b51e1f4 am: bc02cba346

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror-impl/+/1486921

Change-Id: If8fe00e5980337a166eb44404fa9cb343f86692a