Merge remote-tracking branch 'aosp/upstream-master' am: 3aee674667 am: 069c6e09c4

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/async-task/+/1590852

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I22c25f3e63e91b3cf4f998a60c8b5ea1793e4bed