Merge remote-tracking branch 'aosp/upstream-master' into timeout-decorator am: a77f26f116 am: 6a38905745 am: bb0a49a149

Original change: https://android-review.googlesource.com/c/platform/external/python/timeout-decorator/+/2072124

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