tree ea70590c16b9c6d374649a0906b1d28a1d762ca5
parent 8a12e1aa7e8eeb38b519a44df26e7fd5d08e3cfa
parent de942dfdc2adaf3e2fc3529cee7f095cdd6a5fee
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1736471336 -0800
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1736471336 -0800

Merge cherrypicks of ['partner-android-review.googlesource.com/3037772'] into sparse-12883629-L33200030008809322.
SPARSE_CHANGE: I81b02e1107a02840ecf6eae56c0bbe7fdfe880fa


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