Merge "Keystore 2.0 SPI: Use Timestamp from secure clock service" am: f327ea256c am: 5e27a324ac am: 7108d008db

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I574f5752b3b6e3aabad3305084048ff08c6dd63a