tree d222c93f1becc6148a98a66474feff7c0979d504
parent f9d1477ee0a956b2d797d5b96e3f539c3d4394c7
parent f483697144f442174787e942ace5c48a83266c84
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1705521872 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1705521872 +0000

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

Change-Id: I031bac0d0045537ede0c4ab2583496e2e12a1c4f