refs/heads/android12-platform-release - platform/system/security

commit: 2584ceff1628ef9b3d5079c0caf53763a6501b44
[log]
author: Android Build Coastguard Worker <android-build-coastguard-worker@google.com>
Thu Jan 20 18:08:01 2022 +0000
committer: Android Build Coastguard Worker <android-build-coastguard-worker@google.com>
Thu Jan 20 18:08:01 2022 +0000
tree: 4092577b8206991d7a58795c34f03909f3a2d8c0
parent: 8308930023601c86e55650c49e8f0461bb830343 [diff]
parent: ce7f7e2e2810181ea29912c85f55c92b9ebef6c0 [diff]

Merge cherrypicks of [16511960] into sc-platform-release.

Change-Id: I14798fdabfe79810602b62b95fc2b067e5c6170b

tree: 4092577b8206991d7a58795c34f03909f3a2d8c0