tree c870978731eb73437f8612642bc2f122da844939
parent 889d33f3197cefe75c19aed0a794ba4413a0fb78
parent 2ffd023d174cc3b9b840b154620b1fa1264e7a2f
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1710378066 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1710378066 +0000

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

Change-Id: I9906d2bd5eb7b4410e363a26f1e9855ae785eea9