Merge changes from topic "keymint-v3" into main am: 014c710c am: 735298c3

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3345023



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