tree 3799ef5cd715fbef0f08b95b2853d1e82efa8885
parent 3ce15c46c25d1a886e0a826fbcf46b6d630846b9
parent 7bb8eae220ca28ffa927c1688d4ad2ee6d7f683d
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1657158527 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1657158527 +0000

Merge cherrypicks of [17800024, 18160003, 18797386] into sc-d2-release.

Change-Id: Ie23f47043791c3af884465de4381225fb9e3fd6d