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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib7eeb2f1733c724a241f6ce0a5a52a60444def83