tree 8536a59c8818cf5eb9ca12d5e56af3783f865469
parent 1170b1b784992894bd84bd7088dfd29fe7541b1c
parent c6cedad93d89464ee6d1fc39432867e49de11665
author android-build-team Robot <android-build-team-robot@google.com> 1633780199 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633780199 +0000

Snap for 6357023 from c3939fc3d2bbb6210f67e5f41513a60762b6447f to rvc-release am: c6cedad93d

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/keymaster/+/10924521

Change-Id: I45be4a5ac3f983cb80bb80ee08b9802ff8cbda62