Merge changes I67b68a6a,Id19bc319 into main am: a20b817131 am: ccb7fecbc0

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

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