tree 9dbf04c8a3bd9209011a5137d04cca722fea4463
parent d6fbaacb4a3b9eee3d5cb3c1d11b17ae381c08e3
parent 5f50fb35b97f5fdf77d8dfb5179d0dc303f957db
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1706647679 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1706647679 +0000

Merge cherrypicks of ['googleplex-android-review.googlesource.com/26048908', 'googleplex-android-review.googlesource.com/26049212'] into 24Q1-release.

Change-Id: I9756bb1c05d1cf8067a067da5b351957947c48fb