Merge "Upgrade rust/crates/thiserror to 1.0.22" am: 653eefb1b7

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

Change-Id: I920b96a2bebbe4affa68b94a240e65efdc182347