Merge changes from topic "keymint-v3" into main am: 014c710c27

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

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