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

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

Change-Id: Ib7a586cdb9e4e7ebd9ea3834065f70037fdd0afd