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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5ae12a7bdc361e22da751f06e6b20b9ad3a490fd