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

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

Change-Id: I36aa6b0bea2d64363cbdbfda88afba5019b634b6