tree 29a08c6dd02a91f2f92381a1cf9799cf5144436b
parent 708a5b1b0d7be229bf0591e8b7a895e04ef65854
parent 9f84b9f8cd7499346e7d9c7cee4aa1e0806813de
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1639123628 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1639123628 +0000

Merge cherrypicks of [16379730] into security-aosp-sc-release.

Change-Id: Id9f39d3873868143b3812b167b402388f4149ff6