Merge remote-tracking branch 'aosp/upstream-main' am: a2c45bea23 am: 0d1306182f am: dd0b6e3bf2 am: 1de48bf84e

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

Change-Id: I4f5c6a4883719a69ec8ae69173cb1a1be6362af5