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

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1503571

Change-Id: I0491b5c9af375460569d31aff7cd702102914797