Merge changes I23a79eb5,I231079f3 into main am: 94b1285f47 am: 7841358378

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

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