tree ad6a59a0a1ab0ef437c38fc6a470b2d381a5f467
parent eaa93f9e32a4b7600612b15899cca1a097744ea8
parent 38316468aa587733241acac7f56eb430052c28b9
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1734543819 -0800
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1734543819 -0800

Merge cherrypicks of ['partner-android-review.googlesource.com/2991899'] into sparse-12653312-L23900030008443640.
SPARSE_CHANGE: Iee0dafec1a7e6286419056742075a6375e75cca0


Change-Id: Ie13884f6f856a25b85aad1a12ce4594f86fc33c6
Signed-off-by: Coastguard Worker <android-build-coastguard-worker@google.com>