tree ea9115e411730e1e3f9ae481bbbabdc678e5842a
parent cf251a8466d0e698ad0f3ca8fcb14a2ec64b42f6
parent a3539c26bae11d4fbcbb419c88829a27bd46ac7e
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1668477127 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1668477127 +0000

Merge cherrypicks of [20218634, 20393929] into tm-qpr1-release.

Change-Id: I509ccb5de80384a71b9224b8cd2c0190a2e4289c