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

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

Change-Id: I10144c3d21431f71369e4cd63cb7f70876fc3537