Merge changes I197d08eb,I659576af into main am: 28b9b07cc2

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

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