Merge "Make pm#resolveIntent resolve non-exported components" into main

                    userId, resolveForStart, /*allowDynamicSplits*/ true);

            Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER);

            if (resolveForStart) {

                var args = new SaferIntentUtils.IntentArgs(intent, resolvedType,

                    false /* isReceiver */, resolveForStart, filterCallingUid, callingPid);

                        false /* isReceiver */, true, filterCallingUid, callingPid);

                args.platformCompat = mPlatformCompat;

                SaferIntentUtils.filterNonExportedComponents(args, query);

            }

            final boolean queryMayBeFiltered =

                    UserHandle.getAppId(filterCallingUid) >= Process.FIRST_APPLICATION_UID