Merge "Fix for libcore.java.security.ProviderTest#test_Provider_getServices" into oreo-cts-dev
am: 5956489768

Change-Id: I9b022287e4c7e8c99c7975acef1ad6d87c206282