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

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

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