tree fe9dcd42d12a0cb488cdcd86ddc8b31956b04ff2
parent 49a26c2f07d4bf82d0a153663b158147b7514dcc
parent 228f5ee6525a52cef43fe5ec98364cb9e8720132
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1654116327 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1654116327 +0000

Merge cherrypicks of [18231932, 18699572] into sc-qpr3-release.

Change-Id: I597da85d7f69b17a57970fbbf1456ede8d49d767