tree 7715da47c6a672aa7ebc81e9663638d159923a67
parent 050540da9615dd7e9e184800c6f47077c2e343ac
parent 77766839bd1b8cefa1247f0d050357dbc9109dc2
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1636695403 +0000
committer Anis Assi <anisassi@google.com> 1637185600 +0000

Merge cherrypicks of [16101569, 16145004] into security-aosp-pi-release.

Change-Id: I2bf0886e13b83f935560e3c593730b97c9bb825c