tree 0b187b4d97f630c82f500e9f4a45fea995314de1
parent be517076fb183e0acf4f028282d88cc51687ba0d
parent 187c4a9389aae06b1e679b7dafe9e4378f016629
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1721420951 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1721420951 +0000

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

Change-Id: I76e21581707cef835d34b8002082a330b388d79d