Merge "fix check for provider resolution" into oc-dev

am: ade1496f96

Change-Id: Iced763d26e0872d3b6cc5a124e95c413ad7fc436

services/core/java/com/android/server/pm/PackageManagerService.java

@@ -7683,6 +7683,7 @@ public class PackageManagerService extends IPackageManager.Stub
                 }
                 // instant application; filter out non-exposed provider
                 if (instantAppPkgName != null
+                        && !isInstantApp
                         && (provider.info.flags & ProviderInfo.FLAG_VISIBLE_TO_EPHEMERAL) == 0) {
                     return null;
                 }