Merge "Keystore 2.0 SPI: Use Timestamp from secure clock service" am: f327ea256c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I83b779a7bc27edd064727bdf9899b7d39345a35d