tree a14a233971c9de2d5c763fef5c5de39eb7f58730
parent a72f546582ad57a5c97b9c4134759479e61e7a54
parent 2bac10b2372155cc64adafa5cfa76ecdb94c2da6
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1711392127 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1711392127 +0000

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

Change-Id: I6119ff4172f013032a703ef324276cef35447e52