tree 4949b9b279a899989f5667ef1998cc3b24beb6c9
parent f8aaeec51d2964afb376be1e21fb41454c0d8eae
parent 7a15c5896f3047446ba2c689f8a4e73f89a6ea63
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1733748478 -0800
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1733748478 -0800

Merge cherrypicks of ['partner-android-review.googlesource.com/3018132'] into sparse-12754629-L59500030008250585.
SPARSE_CHANGE: Ie71e0955e5af7f7c32df7ea067f02bd7b45cb821


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