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

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

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