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

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

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