[automerger skipped] Merge Android 12L am: 2c598e83f9 -s ours am: 2361674f28 -s ours

am skip reason: Merged-In I4bba4bd5cad27f852250a8018b15c1a9036cafa7 with SHA-1 6bd55a8ed7 is already in history

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

Change-Id: I21bf0917c28c51be16538c4c84e8980244b2f9ac