tree 2d19f771b4139edbfed0b9e0a5d53a97b5245f20
parent 55b5aa7f523054d14b4e58cf8e872ccadfcee562
parent d702d0229c228d107e6710d5456dfab5e0654283
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1643409924 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1643409924 +0000

Merge cherrypicks of [16745824] into sc-d2-release.

Change-Id: If4f02403f205a607b6231553222000934c85ed9e