Merge remote-tracking branch 'aosp/upstream-main' into dev am: a90c04389f am: ddc43dc959 am: d9eed84a58 am: 58b4d19a6b am: 7be4275909

Original change: https://android-review.googlesource.com/c/platform/external/zucchini/+/1877854

Change-Id: Ifdb1f7882cc237258a3395d28158d50bb4b43136