Merge changes I803a0a7a,I7c2a7a3a into main am: 4a1303daa1

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

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