tree 885dc2f1e11fffe9214829b10394e7ed9d11c2ac
parent 2085407c5de522c982f2d0c42b472739479af24c
parent f2e0a95700a937e421647623a60c9fc01d6e5d87
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1637796369 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1637796369 +0000

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

Change-Id: I12fce45b356d85b8c101dae8b8bed9ec84554da5