Merge "ProviderServiceTest: fix SecureRandom test with late binding"