Merge changes I7bb265e1,I5d354019 into main am: e051936726

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

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