tree d58c291f27d797ebd3e1b587663fd261f2008d68
parent aa5e3a3b550105e5b73ac7f09ff00b4f1d35bbe6
parent b341225308bdec32aa209e50ee4cd0b42e2e292b
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1639526718 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1639526718 +0000

Merge cherrypicks of [16410245] into sc-qpr1-release.

Change-Id: Ia2598e532944d1d8882a8a67093de96fe27f6dc4