Merge changes I67b68a6a,Id19bc319 into main am: a20b817131

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

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