tree 1904d34809ba2115c490cc0967933b30599aaf75
parent 747094a017627389066dff582ee58f6024bfa979
parent ec34e08c42543229ae366bc35801bb594cb2ee36
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1702417837 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1702417837 +0000

Merge cherrypicks of ['googleplex-android-review.googlesource.com/25444058', 'googleplex-android-review.googlesource.com/25285689'] into sc-platform-release.

Change-Id: I0cd989207e66d0d0296f5a38df5489f9dc02f166