Merge "Upgrade thiserror to 1.0.40" am: 82a1b41a70 am: 25b8420904 am: be598c911b am: 34b93378f7 am: a38a6fcce1 am: 98cd92109d

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

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