Merge "Allow SecureClock tests to pass on devices w/out SecureClock"