Merge "Support 2nd IMEI and bump KeyMint version to 3" am: 7deaccfd13

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2294717

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