Merge tag 'upstream-v3.13.1' into main am: 8723bd6fd3

Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/3439203

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