Merge "User id match rule should be applied when doing mix matching."

        // determine if exiting on success (or implicit failure as desc is 0)

        if (hasAddrMatch ||

                !((hasUsageExcludeRules && usageExclusionFound) ||

                  (hasUserIdExcludeRules && userIdExclusionFound) ||

                  (hasUsageMatchRules && !usageMatchFound)  ||

                  (hasUidExcludeRules && uidExclusionFound) ||

                  (hasUidMatchRules && !uidMatchFound)) ||

                  (hasUserIdMatchRules && !userIdMatchFound)) {

                  (hasUidMatchRules && !uidMatchFound) ||

                  (hasUserIdExcludeRules && userIdExclusionFound) ||

                  (hasUserIdMatchRules && !userIdMatchFound))) {

            ALOGV("\tgetOutputForAttr will use mix %zu", mixIndex);

            return MixMatchStatus::MATCH;

        }