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

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

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