tree e62c5e92f0cd69e5d5e81917d549ada4939dba79
parent 6a60cfef6d0f34273bca13843696816d6128f917
parent d3cae9d75eb4518a158af46616914dd842909ede
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1723639259 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1723639259 +0000

Merge cherrypicks of ['partner-android-review.googlesource.com/2900931'] into sparse-12186944-L11600030005829703.
SPARSE_CHANGE: I1a25ab5a152b40242fae2923b012afe1299e0311


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