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

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

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