Merge remote-tracking branch 'aosp/upstream-main' into master am: cb4c0971bc am: f125ae6e90 am: 5a4b11e827

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

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