Merge changes I2db3c68b,I30845199 into main am: f7ef28956f am: 3cf89561ed

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

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