tree 8def74512107adb8296471335f55d7ebfeb7ea64
parent af2b96ca93d28d3734dbd2b0bb20443f85c65328
parent 56866c5c6da429008bb2fd9a78acd710dd7086ca
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1722983741 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1722983741 +0000

Merge cherrypicks of ['android-review.googlesource.com/3197217', 'android-review.googlesource.com/3203370'] into 24Q3-release.

Change-Id: Ida44fe5e0a853ea8cea1578c548f8d93ced9bce4