tree ed0af59eb7f90af5bb5c75f63d362d55e2733efa
parent dc6b34c90a32a5ff419a3cb4dd1fa7f6cbee52d3
parent 7408512cc19d5af8f1fb2d78d7f3da1611a4e221
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1710550155 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1710550155 +0000

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

Change-Id: Ieca04072f0f335169aeb00467fcef1cd14028fc1