Merge changes I197d08eb,I659576af into main am: 28b9b07cc2 am: 1e2bacaba8

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

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