tree 7a0eb975eb4f6e8a8a22f1a80ed59107affd8a67
parent 6bfe1b41bd7699cc0a7a31466ec0f7c794614559
parent 65d4e0f8ac3bcb35d8195dd764b451e8dd13bbd7
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1639692956 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1639692956 +0000

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

Change-Id: Ic1cedab80e4c2f567c032dc38cd99e76ae9430ca