tree 0a0f71abc78a755798b6424e82f64b0290cb4391
parent 76769cf95ddc409753779c8d76ae69b6e4039cb8
parent f30dcf8b00b7686a6d295988fe9fcd79a1f27c02
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1711738781 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1711738781 +0000

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

Change-Id: I23f21126a7d7943d26b4e8169505368edcd75854