tree ab4226127d0f579735d49730fc5e26a2c027c1a5
parent b0b44b0650389f686bef2a57158d8d7e8652a5ed
parent db2ae26805fd45f7489cc9b1a9ebf4e2cc380571
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1716300677 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1716300677 +0000

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

Change-Id: I83c1e324eac480eec51959b415f7835d0253a19d