tree eada60fb1a0185ca4988a43dff257ac9dac0a9e4
parent 72d228f52ef5ff18a0f31e241f07523e5d904fbe
parent 33aa4c6abbd263e48c616e92e32d860974fcd9e1
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1640531104 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1640531104 +0000

Merge cherrypicks of [16258319, 16291302] into sc-qpr1-d-release.

Change-Id: I29efb2ffb87dce70cc29bdb2520189a45ffd9101