Merge remote-tracking branch 'origin/upstream' am: b96d052978 am: f3b76fe4b3

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/maplit/+/30359766

Change-Id: Idbdbcafdb1cd33cccd1bce3dcab90b76793fb4da
Signed-off-by: Automerger Merge Worker <[email protected]>