Merge changes I28f673b6,I146f7cfd into main am: 39b7af2fcd

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

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