Merge "Keystore 2.0 SPI: Implement modification time." am: d2e7c2e000 am: f462515bea

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1530772

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9c8a0ba69c125e6812cff732de406482db32bf6d