tree 42ee5531ba81a82dba46b23b8de0d978e2c57174
parent 48be20bb084348720141fc14afacc5d3ecefcb85
parent a955ada53154a4c907303dc6e51b7060cf6d5774
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1709942334 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1709942334 +0000

Merge cherrypicks of ['googleplex-android-review.googlesource.com/26513672', 'googleplex-android-review.googlesource.com/26513673'] into 24Q2-release.

Change-Id: I887087b781dd9d83e6b597eb491e35f046b91aa8