Merge "Update default KeyMint version to 3" am: 4a7c3810fc am: e7a36fadae am: 7b1f23fe51

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2633329

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