Merge changes I7bb265e1,I5d354019 into main am: e051936726 am: f3d33c37c4

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

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