Merge changes Ia1ea17f6,I7c04464c,Id10efe4e into main am: fe64e705b0

Original change: https://android-review.googlesource.com/c/platform/system/security/+/3314787

Change-Id: I1e62026d9faf9dda1ebd4c46b7ec86e7dec7907b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>