tree 2a9fcb1396a5653c9c4f1eeb59b9c141ab72d54e
parent 3e7a1b732d7599340f30aa5dfedaa55ee903dddb
parent 6b14e831f65782903eb1c1df0678d54d288b45c1
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1707938052 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1707938052 +0000

Merge cherrypicks of ['android-review.googlesource.com/2962066', 'android-review.googlesource.com/2962067'] into 24Q2-release.

Change-Id: Id0b7df0dad1cfb0efdf4bec6b7949e88019314d5