Merge "Fix Broken test: libcore.java.security.ProviderTest#test_Provider_Properties"