Merge "Merge "Improve hitrate for ClonedSecureRandomTest" into lollipop-cts-dev am: c3906c8d" into lollipop-mr1-cts-dev