Merge "Keystore 2.0: Make MonotonicRawTime use milliseconds." am: c1c58f0f77

Original change: https://android-review.googlesource.com/c/platform/system/security/+/1706029

Change-Id: Ia803fa10719cf9ec4292712cbb3fe6e2adf201d1