[automerger skipped] Merge "Revert^2 "Activate KeyMint."" am: 11ffd991 -s ours am: 3a0d176e -s ours

am skip reason: Merged-In I85d9e57fe83627992ddaa705946893a4b9890001 with SHA-1 5dfd44ed is already in history

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

Change-Id: I07df2253aff13146b5fb07c8a71c858cc07ac5a6