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

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

Change-Id: Id59c5a8ee71223be958f2b37aab0c2c3fbe45342