Merge remote-tracking branch 'aosp/upstream-main' am: 42b4c61d46 am: 71e7dd63f7 am: c339216720 am: c1a0e4def8

Original change: https://android-review.googlesource.com/c/platform/external/turbine/+/2029125

Change-Id: I2d2d54d844094563b0456a68260a945138ca9086