[automerger skipped] Merge "KeyMint HAL: cert dates are in milliseconds" into...

[automerger skipped] Merge "KeyMint HAL: cert dates are in milliseconds" into sc-dev am: e4e3e89d -s ours am: 671acfac -s ours

am skip reason: Merged-In I6251d4a0ba74d111f4c107f9a54a5c45811aa90f with SHA-1 e6506673 is already in history

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

Change-Id: Ibcabc03426aaa3ce1686d528e80aa1adafb0647e