[automerger skipped] Correct handling of notBefore and notAfter for KM4 am: 240c69064b am: e9d59f8253 -s ours

am skip reason: Merged-In I86afde4e61ebb308975b353498623da01f85ffb2 with SHA-1 0faf82f20f is already in history

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

Change-Id: I987b8b6c82d54134628b0d5c2749daf4bf7aa23d