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

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

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