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

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

Change-Id: Ife8274d1384abd11d8db5859515dd8ab9cbd5518