Merge changes Ic306bb27,I2aa154a9,Ie4e675ca into main am: f10613d8ae

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

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