Merge "Keystore 2.0: Make MonotonicRawTime use milliseconds."